diff --git a/.github/workflows/infra-deploy_reusable.yml b/.github/workflows/infra-deploy_reusable.yml index 98de79c73e..7efe5edd24 100644 --- a/.github/workflows/infra-deploy_reusable.yml +++ b/.github/workflows/infra-deploy_reusable.yml @@ -36,15 +36,6 @@ jobs: - name: "Checkout GitHub Action" uses: actions/checkout@v4 - - name: ✋ Set up mutex - id: mutex-setup - run: | - pushd ../discrete/Signalco.Discrete.Api.Mutex/node-cli - npm install - npm install -g - npx mutex wait signalcoinfra${{ inputs.command }}${{ inputs.project }} - popd - - name: ✨ Setup DotNet ${{ env.DOTNET_VERSION }} Environment uses: actions/setup-dotnet@v4 with: @@ -91,6 +82,15 @@ jobs: - name: ⚒️ Build Infrastructure run: pnpm build --filter=${{ inputs.packageName }} + - name: ✋ Set up mutex + id: mutex-setup + run: | + pushd ../discrete/Signalco.Discrete.Api.Mutex/node-cli + npm install + npm install -g + npx mutex wait signalcoinfra${{ inputs.command }}${{ inputs.project }} + popd + - name: ⚡ Preview Deploy Infrastructure uses: pulumi/actions@v6 with: diff --git a/cloud/README.md b/cloud/README.md index 23512852d9..e604c080ab 100644 --- a/cloud/README.md +++ b/cloud/README.md @@ -64,20 +64,6 @@ Production API - `pulumi config set azure-native:subscriptionId ` - stacks `next` and `production` already configured -##### **AWS (required for Deploy step)** - -- [Get credentials](https://www.pulumi.com/registry/packages/aws/installation-configuration/#get-your-credentials) - - [Create IAM user with **Programmatic access**](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_create.html#id_users_create_console) - - Retrieve aAccess Key ID and Access Key Secret after you created the user -- Configure shared - - on new stack - - `pulumi config set ses-region eu-west-1` - - stacks `next` and `production` are already configured -- Configure - - on new stack - - `$pulumi config set aws:accessKey --secret` - - `$pulumi config set aws:secretKey --secret` - ##### **CloudFlare (required for Deploy step)** - on new stack @@ -101,11 +87,6 @@ Checkly (prereqesite for Pulumi) Required secrets for GitHub actions are: - `PULUMI_ACCESS_TOKEN` [Create a new Pulumi Access Token](https://app.pulumi.com/account/tokens) for Pulumi -- `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` - - To generate go to IAM > Users - - Create user to be used with pulumi - - Configure permissions: AmazonSESFullAccess, IAMFullAccess - - Configure security credentials: Access keys, create new one and retrieve key and secret specified above - Azure access is configured as Pulumi secret via [Service Principal](https://www.pulumi.com/registry/packages/azure-native/installation-configuration/#option-2-use-a-service-principal) - CloudFlare token is configured as Pulumi secret via [Provider](https://www.pulumi.com/registry/packages/cloudflare/installation-configuration/#configuring-the-provider) - Checkly token is configured as Pulumi secret via [API Key](https://www.pulumi.com/registry/packages/checkly/installation-configuration/#configuring-credentials) diff --git a/infra/apps/cloud-primary/Pulumi.next.yaml b/infra/apps/cloud-primary/Pulumi.next.yaml index d3cf58d0d5..cd32c9d8ec 100644 --- a/infra/apps/cloud-primary/Pulumi.next.yaml +++ b/infra/apps/cloud-primary/Pulumi.next.yaml @@ -1,9 +1,4 @@ config: - aws:accessKey: - secure: AAABAE94zXYm+fQ/e5hqo/P5tYzk5exZVi+l3Yw9f/XG/01P1TlSoewLLaFDGOjJbqk+xQ== - aws:region: eu-west-1 - aws:secretKey: - secure: AAABABKpWxWSYjEJOwiVSaWTjRHAc5BPAHI/MaMjPkiivOw2NdIywUUPPWMKG1ibmMV8jyQMVez8obSP4ST70tcQfRfpVogg azure-native:clientId: 92261697-6976-49ea-a6b0-82e81b393e1c azure-native:clientSecret: secure: AAABAISoQTNqX9gB36S936iDwNKxq3rlJtdxJ6c7V5figvuX5ywpqtWx2ca2jxBikrNrB0gUaipqqYOHB9Q/Wdvgbn1HeYmA diff --git a/infra/apps/cloud-primary/Pulumi.production.yaml b/infra/apps/cloud-primary/Pulumi.production.yaml index 7da39fcb5b..657d278d6b 100644 --- a/infra/apps/cloud-primary/Pulumi.production.yaml +++ b/infra/apps/cloud-primary/Pulumi.production.yaml @@ -1,9 +1,4 @@ config: - aws:accessKey: - secure: AAABAKku4YP8eoWXMJEDj18KHrOUTjGpzFvQcql+aiEzMrFaW/5BRCVrWc6aiNTycZRFNg== - aws:region: eu-west-1 - aws:secretKey: - secure: AAABAPRhk7wWsd5gy9LJ+WdoNN75FTtTnTBznFAHeuGoPJXZVBmFTSUT4iG4ETc5/5FbhyRL8qYgQ8ecPoLoPf+hXDfQmt9v azure-native:clientId: 92261697-6976-49ea-a6b0-82e81b393e1c azure-native:clientSecret: secure: AAABAC376ki/qNheVmoytBk5xXimZMUBj+UKT0AfjALOV9S+pxOC3dThUmPaaVzo/jFlaud33QU7oBEEuJcIQoWDQuYx0mkx diff --git a/infra/apps/cloud-primary/package.json b/infra/apps/cloud-primary/package.json index 0ea0071722..8a2450beb6 100644 --- a/infra/apps/cloud-primary/package.json +++ b/infra/apps/cloud-primary/package.json @@ -24,7 +24,6 @@ }, "dependencies": { "@checkly/pulumi": "1.1.4", - "@pulumi/aws": "6.54.0", "@pulumi/azure-native": "2.63.0", "@pulumi/cloudflare": "5.39.1", "@pulumi/command": "1.0.1", diff --git a/infra/pnpm-lock.yaml b/infra/pnpm-lock.yaml index d2447d5e6e..eee2962811 100644 --- a/infra/pnpm-lock.yaml +++ b/infra/pnpm-lock.yaml @@ -23,9 +23,6 @@ importers: '@checkly/pulumi': specifier: 1.1.4 version: 1.1.4(ts-node@7.0.1)(typescript@5.6.2) - '@pulumi/aws': - specifier: 6.54.0 - version: 6.54.0(ts-node@7.0.1)(typescript@5.6.2) '@pulumi/azure-native': specifier: 2.63.0 version: 2.63.0(ts-node@7.0.1)(typescript@5.6.2) @@ -766,9 +763,6 @@ packages: '@protobufjs/utf8@1.1.0': resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} - '@pulumi/aws@6.54.0': - resolution: {integrity: sha512-kBiZCN/FE76oKo59150C2ZHc4kwg4U9jwuElyo80bF4y8deAOHBaq5vDBT95TTZqg9vNSAqIr5XWwAc9V5YGxQ==} - '@pulumi/azure-native@2.63.0': resolution: {integrity: sha512-DDQ5N88JLd4vZGx8myXzuYr+tJT+T6MR0fBpfgTi1wHzIY+OyMUcjTWavLC+1kNHjauPm9r9S+jkEE4iHw+nZg==} @@ -1149,10 +1143,6 @@ packages: buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} - builtin-modules@3.0.0: - resolution: {integrity: sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==} - engines: {node: '>=6'} - builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} @@ -2057,11 +2047,6 @@ packages: resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} engines: {node: '>=8.6'} - mime@2.6.0: - resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} - engines: {node: '>=4.0.0'} - hasBin: true - mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} @@ -3327,18 +3312,6 @@ snapshots: '@protobufjs/utf8@1.1.0': {} - '@pulumi/aws@6.54.0(ts-node@7.0.1)(typescript@5.6.2)': - dependencies: - '@pulumi/pulumi': 3.134.1(ts-node@7.0.1)(typescript@5.6.2) - builtin-modules: 3.0.0 - mime: 2.6.0 - resolve: 1.22.8 - transitivePeerDependencies: - - bluebird - - supports-color - - ts-node - - typescript - '@pulumi/azure-native@2.63.0(ts-node@7.0.1)(typescript@5.6.2)': dependencies: '@pulumi/pulumi': 3.134.1(ts-node@7.0.1)(typescript@5.6.2) @@ -3790,8 +3763,6 @@ snapshots: buffer-from@1.1.2: {} - builtin-modules@3.0.0: {} - builtins@5.0.1: dependencies: semver: 7.6.3 @@ -4864,8 +4835,6 @@ snapshots: braces: 3.0.2 picomatch: 2.3.1 - mime@2.6.0: {} - mimic-fn@2.1.0: {} mimic-response@1.0.1: {} diff --git a/renovate.json b/renovate.json index 802ac9cf42..7950f44f55 100644 --- a/renovate.json +++ b/renovate.json @@ -60,7 +60,6 @@ "webpack", "xunit", "mcr.microsoft.com/playwright", - "@pulumi/aws", "@pulumi/azure-native", "@pulumi/pulumi", "@pulumi/cloudflare", diff --git a/station/.gitignore b/station/.gitignore index 269c45428d..ff8f61fd68 100644 --- a/station/.gitignore +++ b/station/.gitignore @@ -465,9 +465,6 @@ MigrationBackup/ .idea/**/dictionaries .idea/**/shelf -# AWS User-specific -.idea/**/aws.xml - # Generated files .idea/**/contentModel.xml