From 7d275b3ec3d9686c9bafff7d3f29ddefe4cd6478 Mon Sep 17 00:00:00 2001 From: Kevin Stiehl Date: Thu, 3 Dec 2020 18:30:32 +0100 Subject: [PATCH] fix(cloudfoundry): fetch credentials from vault (#2444) --- cmd/abapEnvironmentCreateSystem_generated.go | 4 ++-- cmd/cloudFoundryCreateServiceKey_generated.go | 4 ++-- cmd/cloudFoundryCreateService_generated.go | 4 ++-- cmd/cloudFoundryDeleteService_generated.go | 4 ++-- cmd/cloudFoundryDeploy_generated.go | 4 ++-- resources/metadata/abapEnvironmentCreateSystem.yaml | 12 ++++++------ resources/metadata/cloudFoundryCreateService.yaml | 12 ++++++------ resources/metadata/cloudFoundryCreateServiceKey.yaml | 12 ++++++------ resources/metadata/cloudFoundryDeleteService.yaml | 12 ++++++------ resources/metadata/cloudFoundryDeploy.yaml | 12 ++++++------ 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/cmd/abapEnvironmentCreateSystem_generated.go b/cmd/abapEnvironmentCreateSystem_generated.go index de6df20be..126a6b6b7 100644 --- a/cmd/abapEnvironmentCreateSystem_generated.go +++ b/cmd/abapEnvironmentCreateSystem_generated.go @@ -147,7 +147,7 @@ func abapEnvironmentCreateSystemMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, @@ -167,7 +167,7 @@ func abapEnvironmentCreateSystemMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, diff --git a/cmd/cloudFoundryCreateServiceKey_generated.go b/cmd/cloudFoundryCreateServiceKey_generated.go index 090579774..2fa51d2ba 100644 --- a/cmd/cloudFoundryCreateServiceKey_generated.go +++ b/cmd/cloudFoundryCreateServiceKey_generated.go @@ -131,7 +131,7 @@ func cloudFoundryCreateServiceKeyMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, @@ -151,7 +151,7 @@ func cloudFoundryCreateServiceKeyMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, diff --git a/cmd/cloudFoundryCreateService_generated.go b/cmd/cloudFoundryCreateService_generated.go index 0e5dee4c4..b93325590 100644 --- a/cmd/cloudFoundryCreateService_generated.go +++ b/cmd/cloudFoundryCreateService_generated.go @@ -147,7 +147,7 @@ func cloudFoundryCreateServiceMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, @@ -167,7 +167,7 @@ func cloudFoundryCreateServiceMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, diff --git a/cmd/cloudFoundryDeleteService_generated.go b/cmd/cloudFoundryDeleteService_generated.go index 7367c1e92..0f8ef24ff 100644 --- a/cmd/cloudFoundryDeleteService_generated.go +++ b/cmd/cloudFoundryDeleteService_generated.go @@ -128,7 +128,7 @@ func cloudFoundryDeleteServiceMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, @@ -148,7 +148,7 @@ func cloudFoundryDeleteServiceMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, diff --git a/cmd/cloudFoundryDeploy_generated.go b/cmd/cloudFoundryDeploy_generated.go index 7544ee7d6..3183ecd46 100644 --- a/cmd/cloudFoundryDeploy_generated.go +++ b/cmd/cloudFoundryDeploy_generated.go @@ -407,7 +407,7 @@ func cloudFoundryDeployMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, @@ -451,7 +451,7 @@ func cloudFoundryDeployMetadata() config.StepData { { Name: "", - Paths: []string{"$(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace)"}, + Paths: []string{"$(vaultPath)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space)", "$(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)"}, Type: "vaultSecret", }, }, diff --git a/resources/metadata/abapEnvironmentCreateSystem.yaml b/resources/metadata/abapEnvironmentCreateSystem.yaml index f3cb3c312..b5b3b51d5 100644 --- a/resources/metadata/abapEnvironmentCreateSystem.yaml +++ b/resources/metadata/abapEnvironmentCreateSystem.yaml @@ -40,9 +40,9 @@ spec: param: username - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: password type: string description: Password for Cloud Foundry User @@ -58,9 +58,9 @@ spec: param: password - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: cfOrg type: string description: Cloud Foundry org diff --git a/resources/metadata/cloudFoundryCreateService.yaml b/resources/metadata/cloudFoundryCreateService.yaml index 88776d99d..d4541463c 100644 --- a/resources/metadata/cloudFoundryCreateService.yaml +++ b/resources/metadata/cloudFoundryCreateService.yaml @@ -48,9 +48,9 @@ spec: param: username - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: password type: string description: Password for Cloud Foundry User @@ -66,9 +66,9 @@ spec: param: password - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: cfOrg type: string description: Cloud Foundry org diff --git a/resources/metadata/cloudFoundryCreateServiceKey.yaml b/resources/metadata/cloudFoundryCreateServiceKey.yaml index a1b05056e..3d073c618 100644 --- a/resources/metadata/cloudFoundryCreateServiceKey.yaml +++ b/resources/metadata/cloudFoundryCreateServiceKey.yaml @@ -36,9 +36,9 @@ spec: param: username - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: password type: string description: User Password for CF User @@ -54,9 +54,9 @@ spec: param: password - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: cfOrg type: string description: CF org diff --git a/resources/metadata/cloudFoundryDeleteService.yaml b/resources/metadata/cloudFoundryDeleteService.yaml index 9780f5adc..e11c2ad80 100644 --- a/resources/metadata/cloudFoundryDeleteService.yaml +++ b/resources/metadata/cloudFoundryDeleteService.yaml @@ -36,9 +36,9 @@ spec: param: username - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: password type: string description: User Password for CF User @@ -54,9 +54,9 @@ spec: param: password - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: cfOrg type: string description: CF org diff --git a/resources/metadata/cloudFoundryDeploy.yaml b/resources/metadata/cloudFoundryDeploy.yaml index 94756e156..c2fa8dc49 100644 --- a/resources/metadata/cloudFoundryDeploy.yaml +++ b/resources/metadata/cloudFoundryDeploy.yaml @@ -302,9 +302,9 @@ spec: param: password - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) - name: smokeTestScript type: string description: @@ -357,9 +357,9 @@ spec: param: username - type: vaultSecret paths: - - $(vaultPath)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(cfOrg)-$(cfSpace) - - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(cfOrg)-$(cfSpace) + - $(vaultPath)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/$(vaultPipelineName)/cloudfoundry-$(org)-$(space) + - $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space) containers: - name: cfDeploy image: ppiper/cf-cli