diff --git a/cmd/abapAddonAssemblyKitCheck.go b/cmd/abapAddonAssemblyKitCheck.go index c4ce5950d0..0ab0b12621 100644 --- a/cmd/abapAddonAssemblyKitCheck.go +++ b/cmd/abapAddonAssemblyKitCheck.go @@ -27,7 +27,7 @@ func runAbapAddonAssemblyKitCheck(config *abapAddonAssemblyKitCheckOptions, util log.Entry().Info("╚═══════════════════════════╝") conn := new(abapbuild.Connector) - if err := conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, utils, "", config.AbapAddonAssemblyKitCertificateFile, config.AbapAddonAssemblyKitCertificatePass); err != nil { + if err := conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, utils, config.AbapAddonAssemblyKitOriginHash, config.AbapAddonAssemblyKitCertificateFile, config.AbapAddonAssemblyKitCertificatePass); err != nil { return err } diff --git a/cmd/abapAddonAssemblyKitCheck_generated.go b/cmd/abapAddonAssemblyKitCheck_generated.go index 71d2226046..3711fb3110 100644 --- a/cmd/abapAddonAssemblyKitCheck_generated.go +++ b/cmd/abapAddonAssemblyKitCheck_generated.go @@ -25,6 +25,7 @@ type abapAddonAssemblyKitCheckOptions struct { Password string `json:"password,omitempty"` AddonDescriptorFileName string `json:"addonDescriptorFileName,omitempty"` AddonDescriptor string `json:"addonDescriptor,omitempty"` + AbapAddonAssemblyKitOriginHash string `json:"abapAddonAssemblyKitOriginHash,omitempty"` } type abapAddonAssemblyKitCheckCommonPipelineEnvironment struct { @@ -97,6 +98,7 @@ For Terminology refer to the [Scenario Description](https://www.project-piper.io log.RegisterSecret(stepConfig.AbapAddonAssemblyKitCertificatePass) log.RegisterSecret(stepConfig.Username) log.RegisterSecret(stepConfig.Password) + log.RegisterSecret(stepConfig.AbapAddonAssemblyKitOriginHash) if len(GeneralConfig.HookConfig.SentryConfig.Dsn) > 0 { sentryHook := log.NewSentryHook(GeneralConfig.HookConfig.SentryConfig.Dsn, GeneralConfig.CorrelationID) @@ -173,6 +175,7 @@ func addAbapAddonAssemblyKitCheckFlags(cmd *cobra.Command, stepConfig *abapAddon cmd.Flags().StringVar(&stepConfig.Password, "password", os.Getenv("PIPER_password"), "Password for the Addon Assembly Kit as a Service (AAKaaS) system") cmd.Flags().StringVar(&stepConfig.AddonDescriptorFileName, "addonDescriptorFileName", `addon.yml`, "File name of the YAML file which describes the Product Version and corresponding Software Component Versions") cmd.Flags().StringVar(&stepConfig.AddonDescriptor, "addonDescriptor", os.Getenv("PIPER_addonDescriptor"), "Structure in the commonPipelineEnvironment containing information about the Product Version and corresponding Software Component Versions") + cmd.Flags().StringVar(&stepConfig.AbapAddonAssemblyKitOriginHash, "abapAddonAssemblyKitOriginHash", os.Getenv("PIPER_abapAddonAssemblyKitOriginHash"), "Origin Hash for restricted AAKaaS scenarios") cmd.MarkFlagRequired("abapAddonAssemblyKitEndpoint") cmd.MarkFlagRequired("addonDescriptorFileName") @@ -274,6 +277,15 @@ func abapAddonAssemblyKitCheckMetadata() config.StepData { Aliases: []config.Alias{}, Default: os.Getenv("PIPER_addonDescriptor"), }, + { + Name: "abapAddonAssemblyKitOriginHash", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"PARAMETERS"}, + Type: "string", + Mandatory: false, + Aliases: []config.Alias{}, + Default: os.Getenv("PIPER_abapAddonAssemblyKitOriginHash"), + }, }, }, Outputs: config.StepOutputs{ diff --git a/resources/metadata/abapAddonAssemblyKitCheck.yaml b/resources/metadata/abapAddonAssemblyKitCheck.yaml index a5f9463d99..d3d2e1ca64 100644 --- a/resources/metadata/abapAddonAssemblyKitCheck.yaml +++ b/resources/metadata/abapAddonAssemblyKitCheck.yaml @@ -91,6 +91,13 @@ spec: resourceRef: - name: commonPipelineEnvironment param: abap/addonDescriptor + - name: abapAddonAssemblyKitOriginHash + type: string + description: Origin Hash for restricted AAKaaS scenarios + scope: + - PARAMETERS + mandatory: false + secret: true outputs: resources: - name: commonPipelineEnvironment