From 24aafb0b696e36d48be4b89bffd70502fcaf105f Mon Sep 17 00:00:00 2001 From: Kevin Stiehl Date: Mon, 26 Oct 2020 14:20:04 +0100 Subject: [PATCH] add vaultSecretFileReferences (#2203) * add vaultSecretFileReferences * fix test * fix test * go generate * remove code duplication Co-authored-by: Christopher Fenner <26137398+CCFenner@users.noreply.github.com> --- cmd/abapAddonAssemblyKitCheckCVs_generated.go | 1 + cmd/abapAddonAssemblyKitCheckPV_generated.go | 1 + ...AssemblyKitCreateTargetVector_generated.go | 1 + ...ssemblyKitPublishTargetVector_generated.go | 1 + ...onAssemblyKitRegisterPackages_generated.go | 1 + ...donAssemblyKitReleasePackages_generated.go | 1 + ...ssemblyKitReserveNextPackages_generated.go | 1 + ...apEnvironmentAssemblePackages_generated.go | 1 + ...abapEnvironmentCheckoutBranch_generated.go | 1 + cmd/abapEnvironmentCloneGitRepo_generated.go | 1 + cmd/abapEnvironmentPullGitRepo_generated.go | 1 + cmd/abapEnvironmentRunATCCheck_generated.go | 1 + cmd/artifactPrepareVersion_generated.go | 1 + cmd/checkmarxExecuteScan_generated.go | 1 + cmd/cloudFoundryCreateServiceKey_generated.go | 1 + cmd/cloudFoundryCreateService_generated.go | 1 + cmd/cloudFoundryCreateSpace_generated.go | 1 + cmd/cloudFoundryDeleteService_generated.go | 1 + cmd/cloudFoundryDeleteSpace_generated.go | 1 + cmd/cloudFoundryDeploy_generated.go | 1 + cmd/containerSaveImage_generated.go | 1 + cmd/detectExecuteScan_generated.go | 1 + cmd/fortifyExecuteScan_generated.go | 1 + cmd/gctsCloneRepository_generated.go | 1 + cmd/gctsCreateRepository_generated.go | 1 + cmd/gctsDeploy_generated.go | 1 + cmd/gctsExecuteABAPUnitTests_generated.go | 1 + cmd/gctsRollback_generated.go | 1 + cmd/githubCheckBranchProtection_generated.go | 1 + cmd/githubCreatePullRequest_generated.go | 1 + cmd/githubPublishRelease_generated.go | 1 + cmd/githubSetCommitStatus_generated.go | 1 + cmd/gitopsUpdateDeployment_generated.go | 1 + cmd/jsonApplyPatch_generated.go | 1 + cmd/kanikoExecute_generated.go | 1 + cmd/karmaExecuteTests_generated.go | 1 + cmd/kubernetesDeploy_generated.go | 1 + cmd/malwareExecuteScan_generated.go | 1 + cmd/mavenBuild_generated.go | 1 + cmd/mavenExecuteIntegration_generated.go | 1 + cmd/mavenExecuteStaticCodeChecks_generated.go | 1 + cmd/mavenExecute_generated.go | 1 + cmd/mtaBuild_generated.go | 1 + cmd/nexusUpload_generated.go | 1 + cmd/npmExecuteLint_generated.go | 1 + cmd/npmExecuteScripts_generated.go | 1 + cmd/protecodeExecuteScan_generated.go | 1 + cmd/sonarExecuteScan_generated.go | 1 + cmd/whitesourceExecuteScan_generated.go | 1 + cmd/xsDeploy_generated.go | 1 + pkg/config/config.go | 2 +- pkg/config/vault.go | 110 +++++++++++++----- pkg/config/vault_test.go | 58 +++++++-- pkg/generator/helper/helper.go | 1 + .../custom_step_code_generated.golden | 1 + .../step_code_generated.golden | 1 + 56 files changed, 185 insertions(+), 38 deletions(-) diff --git a/cmd/abapAddonAssemblyKitCheckCVs_generated.go b/cmd/abapAddonAssemblyKitCheckCVs_generated.go index f98fc8f06..04db9b30c 100644 --- a/cmd/abapAddonAssemblyKitCheckCVs_generated.go +++ b/cmd/abapAddonAssemblyKitCheckCVs_generated.go @@ -93,6 +93,7 @@ It resolves the dotted version string into version, support package level and pa telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapAddonAssemblyKitCheckPV_generated.go b/cmd/abapAddonAssemblyKitCheckPV_generated.go index affa2df7a..ecb52d103 100644 --- a/cmd/abapAddonAssemblyKitCheckPV_generated.go +++ b/cmd/abapAddonAssemblyKitCheckPV_generated.go @@ -93,6 +93,7 @@ It resolves the dotted version string into version, support package stack level telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapAddonAssemblyKitCreateTargetVector_generated.go b/cmd/abapAddonAssemblyKitCreateTargetVector_generated.go index 0cb3b88bf..d246802bb 100644 --- a/cmd/abapAddonAssemblyKitCreateTargetVector_generated.go +++ b/cmd/abapAddonAssemblyKitCreateTargetVector_generated.go @@ -93,6 +93,7 @@ The Target Vector describes the software state, which shall be reached in the ma telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapAddonAssemblyKitPublishTargetVector_generated.go b/cmd/abapAddonAssemblyKitPublishTargetVector_generated.go index 8f6a35cb8..6add0addd 100644 --- a/cmd/abapAddonAssemblyKitPublishTargetVector_generated.go +++ b/cmd/abapAddonAssemblyKitPublishTargetVector_generated.go @@ -62,6 +62,7 @@ With targetVectorScope "T" the Target Vector will be published to the test envir telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() telemetry.Send(&telemetryData) diff --git a/cmd/abapAddonAssemblyKitRegisterPackages_generated.go b/cmd/abapAddonAssemblyKitRegisterPackages_generated.go index 81a0756cc..a752d0f89 100644 --- a/cmd/abapAddonAssemblyKitRegisterPackages_generated.go +++ b/cmd/abapAddonAssemblyKitRegisterPackages_generated.go @@ -94,6 +94,7 @@ The new status "L"ocked is written back to the addonDescriptor in the commonPipe telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapAddonAssemblyKitReleasePackages_generated.go b/cmd/abapAddonAssemblyKitReleasePackages_generated.go index 03c1a2441..513708157 100644 --- a/cmd/abapAddonAssemblyKitReleasePackages_generated.go +++ b/cmd/abapAddonAssemblyKitReleasePackages_generated.go @@ -91,6 +91,7 @@ store. The new status "R"eleased is written back to the addonDescriptor in the c telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapAddonAssemblyKitReserveNextPackages_generated.go b/cmd/abapAddonAssemblyKitReserveNextPackages_generated.go index b6e5945df..3ed724399 100644 --- a/cmd/abapAddonAssemblyKitReserveNextPackages_generated.go +++ b/cmd/abapAddonAssemblyKitReserveNextPackages_generated.go @@ -96,6 +96,7 @@ The name, type and namespace of each package is written back to the addonDescrip telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapEnvironmentAssemblePackages_generated.go b/cmd/abapEnvironmentAssemblePackages_generated.go index 05d4be95b..46e8c45db 100644 --- a/cmd/abapEnvironmentAssemblePackages_generated.go +++ b/cmd/abapEnvironmentAssemblePackages_generated.go @@ -98,6 +98,7 @@ Platform ABAP Environment system and saves the corresponding [SAR archive](https telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() commonPipelineEnvironment.persist(GeneralConfig.EnvRootPath, "commonPipelineEnvironment") telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() diff --git a/cmd/abapEnvironmentCheckoutBranch_generated.go b/cmd/abapEnvironmentCheckoutBranch_generated.go index 24db088f4..171e9dd2f 100644 --- a/cmd/abapEnvironmentCheckoutBranch_generated.go +++ b/cmd/abapEnvironmentCheckoutBranch_generated.go @@ -72,6 +72,7 @@ Please provide either of the following options: telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() telemetry.Send(&telemetryData) diff --git a/cmd/abapEnvironmentCloneGitRepo_generated.go b/cmd/abapEnvironmentCloneGitRepo_generated.go index d31ec018a..2a6636357 100644 --- a/cmd/abapEnvironmentCloneGitRepo_generated.go +++ b/cmd/abapEnvironmentCloneGitRepo_generated.go @@ -72,6 +72,7 @@ Please provide either of the following options: telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() telemetry.Send(&telemetryData) diff --git a/cmd/abapEnvironmentPullGitRepo_generated.go b/cmd/abapEnvironmentPullGitRepo_generated.go index f14ad78e1..9f4d9b753 100644 --- a/cmd/abapEnvironmentPullGitRepo_generated.go +++ b/cmd/abapEnvironmentPullGitRepo_generated.go @@ -71,6 +71,7 @@ Please provide either of the following options: telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() telemetry.Send(&telemetryData) diff --git a/cmd/abapEnvironmentRunATCCheck_generated.go b/cmd/abapEnvironmentRunATCCheck_generated.go index b09831a44..1b3ab2c73 100644 --- a/cmd/abapEnvironmentRunATCCheck_generated.go +++ b/cmd/abapEnvironmentRunATCCheck_generated.go @@ -73,6 +73,7 @@ Regardless of the option you chose, please make sure to provide the configuratio telemetryData := telemetry.CustomData{} telemetryData.ErrorCode = "1" handler := func() { + config.RemoveVaultSecretFiles() telemetryData.Duration = fmt.Sprintf("%v", time.Since(startTime).Milliseconds()) telemetryData.ErrorCategory = log.GetErrorCategory().String() telemetry.Send(&telemetryData) diff --git a/cmd/artifactPrepareVersion_generated.go b/cmd/artifactPrepareVersion_generated.go index a43ec02e1..e29cd0c94 100644 --- a/cmd/artifactPrepareVersion_generated.go +++ b/cmd/artifactPrepareVersion_generated.go @@ -173,6 +173,7 @@ Define ` + "`" + `buildTool: custom` + "`" + `, ` + "`" + `filePath: --install --force --namespace