Skip to content

Commit 17e5c14

Browse files
authored
MRG: Merge pull request #19 from octue/move-to-octue-twined-services-project
Move to `octue-twined-services` project
2 parents 1e9f5fe + 624b8dd commit 17e5c14

File tree

15 files changed

+26
-212
lines changed

15 files changed

+26
-212
lines changed

.github/workflows/cd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
id-token: write
1414
contents: read
1515
with:
16-
gcp_project_name: octue-openfast
17-
gcp_project_number: 86611255144
18-
gcp_region: europe-west3
16+
gcp_project_name: octue-twined-services
17+
gcp_project_number: 13074362726
18+
gcp_region: europe-west9
1919
gcp_resource_affix: octue
2020
gcp_service_name: openfast-service
2121
local_dockerfile: ./Dockerfile

.github/workflows/python-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
id: auth
3737
uses: google-github-actions/auth@v2
3838
with:
39-
workload_identity_provider: "projects/86611255144/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider"
40-
service_account: "github-actions@octue-openfast.iam.gserviceaccount.com"
39+
workload_identity_provider: "projects/13074362726/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider"
40+
service_account: "github-actions@octue-twined-services.iam.gserviceaccount.com"
4141

4242
- name: Run tests
4343
run: poetry run python -m unittest

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
id: auth
2929
uses: google-github-actions/auth@v2
3030
with:
31-
workload_identity_provider: "projects/86611255144/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider"
32-
service_account: "github-actions@octue-openfast.iam.gserviceaccount.com"
31+
workload_identity_provider: "projects/13074362726/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider"
32+
service_account: "github-actions@octue-twined-services.iam.gserviceaccount.com"
3333

3434
- name: Run tests
3535
run: poetry run python -m unittest
@@ -70,9 +70,9 @@ jobs:
7070
id-token: write
7171
contents: read
7272
with:
73-
gcp_project_name: octue-openfast
74-
gcp_project_number: 86611255144
75-
gcp_region: europe-west3
73+
gcp_project_name: octue-twined-services
74+
gcp_project_number: 13074362726
75+
gcp_region: europe-west9
7676
gcp_resource_affix: octue
7777
gcp_service_name: openfast-service
7878
local_dockerfile: ./Dockerfile

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ from octue.resources import Child, Dataset, Manifest
2525

2626
# Point to your data service
2727
child = Child(
28-
id="my-org/openfast-service:0.10.1",
28+
id="my-org/openfast-service:0.10.2",
2929
backend={"name": "GCPPubSubBackend", "project_name": "my-project"},
3030
)
3131

@@ -48,4 +48,4 @@ the service supports.
4848

4949
| `openfast-service` versions | OpenFAST version |
5050
|-----------------------------| ---------------- |
51-
| `<=0.10.1` | `3.5.3` |
51+
| `<=0.10.2` | `3.5.3` |

app_configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"output_location": "gs://main-octue-octue-openfast-octue-twined/openfast-service/outputs"
2+
"output_location": "gs://octue-octue-twined-services-octue-twined/openfast-service/outputs"
33
}

octue.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ services:
33
name: openfast-service
44
app_source_path: openfast_service
55
app_configuration_path: app_configuration.json
6-
diagnostics_cloud_path: gs://octue-openfast-service/diagnostics
6+
diagnostics_cloud_path: gs://octue-octue-twined-services-octue-twined/openfast-service/diagnostics
77
event_store_table_id: main_octue_twined.service-events
88
service_registries:
9-
- name: OpenFAST service registry
10-
endpoint: https://europe-west3-octue-openfast.cloudfunctions.net/main-octue-twined-service-registry
9+
- name: Octue service registry
10+
endpoint: https://europe-west9-octue-twined-services.cloudfunctions.net/main-octue-twined-service-registry

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "openfast-service"
3-
version = "0.10.1"
3+
version = "0.10.2"
44
description = ""
55
authors = ["Marcus Lugg <[email protected]>"]
66
readme = "README.md"

terraform/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

terraform/main.tf

Lines changed: 0 additions & 69 deletions
This file was deleted.

terraform/outputs.tf

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)