diff --git a/.github/scripts/dispatch_internal_repo_workflow.sh b/.github/scripts/dispatch_internal_repo_workflow.sh index 3e4969d7d..cf51671a2 100755 --- a/.github/scripts/dispatch_internal_repo_workflow.sh +++ b/.github/scripts/dispatch_internal_repo_workflow.sh @@ -13,7 +13,6 @@ # --terraformAction \ # --internalRef \ # --overrides \ -# --overrideProjectName \ # --overrideRoleName # @@ -33,7 +32,6 @@ # --terraformAction "apply" \ # --internalRef "main" \ # --overrides "tf_var=someString" \ -# --overrideProjectName nhs \ # --overrideRoleName nhs-service-iam-role \ # --extraSecretNames '["MY_API_KEY"]' @@ -82,10 +80,6 @@ while [[ $# -gt 0 ]]; do overrides="$2" shift 2 ;; - --overrideProjectName) # Override the project name (optional) - overrideProjectName="$2" - shift 2 - ;; --overrideRoleName) # Override the role name (optional) overrideRoleName="$2" shift 2 @@ -242,9 +236,7 @@ echo " targetAccountGroup: $targetAccountGroup" echo " terraformAction: $terraformAction" echo " internalRef: $internalRef" echo " overrides: $overrides" -echo " overrideProjectName: $overrideProjectName" echo " overrideRoleName: $overrideRoleName" -echo " targetProject: $targetProject" echo " runId: $runId" echo " buildSandbox: $buildSandbox" echo " apimEnvironment: $apimEnvironment" @@ -263,9 +255,7 @@ DISPATCH_EVENT=$(jq -ncM \ --arg terraformAction "$terraformAction" \ --arg targetWorkflow "$targetWorkflow" \ --arg overrides "$overrides" \ - --arg overrideProjectName "$overrideProjectName" \ --arg overrideRoleName "$overrideRoleName" \ - --arg targetProject "$targetProject" \ --arg runId "$runId" \ --arg buildSandbox "$buildSandbox" \ --arg apimEnvironment "$apimEnvironment" \ @@ -280,9 +270,7 @@ DISPATCH_EVENT=$(jq -ncM \ "inputs": ( (if $infraRepoName != "" then { "infraRepoName": $infraRepoName } else {} end) + (if $terraformAction != "" then { "terraformAction": $terraformAction } else {} end) + - (if $overrideProjectName != "" then { "overrideProjectName": $overrideProjectName } else {} end) + (if $overrideRoleName != "" then { "overrideRoleName": $overrideRoleName } else {} end) + - (if $targetProject != "" then { "targetProject": $targetProject } else {} end) + (if $overrides != "" then { "overrides": $overrides } else {} end) + (if $runId != "" then { "runId": $runId } else {} end) + (if $buildSandbox != "" then { "buildSandbox": $buildSandbox } else {} end) + diff --git a/.github/workflows/pr_destroy_dynamic_env.yaml b/.github/workflows/pr_destroy_dynamic_env.yaml index 61e74a21d..f5963d7d4 100644 --- a/.github/workflows/pr_destroy_dynamic_env.yaml +++ b/.github/workflows/pr_destroy_dynamic_env.yaml @@ -36,7 +36,6 @@ jobs: --targetComponent "api" \ --targetAccountGroup "nhs-notify-supplier-api-dev" \ --terraformAction "destroy" \ - --overrideProjectName "nhs" \ --overrideRoleName "nhs-main-acct-supplier-api-github-deploy" destroy-dynamic-proxy: diff --git a/.github/workflows/stage-3-build.yaml b/.github/workflows/stage-3-build.yaml index 5b8811413..382e16ee8 100644 --- a/.github/workflows/stage-3-build.yaml +++ b/.github/workflows/stage-3-build.yaml @@ -187,7 +187,6 @@ jobs: --targetComponent "api" \ --targetAccountGroup "nhs-notify-supplier-api-dev" \ --terraformAction "apply" \ - --overrideProjectName "nhs" \ --overrideRoleName "nhs-main-acct-supplier-api-github-deploy" populate-config: name: "Populate Supplier Config" diff --git a/.github/workflows/stage-4-acceptance.yaml b/.github/workflows/stage-4-acceptance.yaml index a314c081a..098f7451b 100644 --- a/.github/workflows/stage-4-acceptance.yaml +++ b/.github/workflows/stage-4-acceptance.yaml @@ -77,7 +77,6 @@ jobs: --targetWorkflow "dispatch-contextual-tests-dynamic-env.yaml" \ --infraRepoName "nhs-notify-supplier-api" \ --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \ - --overrideProjectName "nhs" \ --targetEnvironment "$ENVIRONMENT" \ --targetAccountGroup "nhs-notify-supplier-api-dev" \ --targetComponent "api" \ diff --git a/README.md b/README.md index 4286751ea..ba063dff1 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ New developers of the NHS Notify Supplier API should understand the below. sso_start_url = https://d-9c67018f89.awsapps.com/start#/ sso_region = eu-west-2 sso_account_id = 820178564574 - sso_role_name = nhs-notify-bc-developer + sso_role_name = nhs-notify-developer region = eu-west-2 output = json @@ -90,7 +90,7 @@ New developers of the NHS Notify Supplier API should understand the below. sso_start_url = https://d-9c67018f89.awsapps.com/start#/ sso_region = eu-west-2 sso_account_id = 885964308133 - sso_role_name = nhs-notify-bc-developer + sso_role_name = nhs-notify-developer region = eu-west-2 output = json ```