Merge branch 'master' into mtaExtensionDescriptorsParameter

SAP · Aug 12, 2024 · d9fd0a8 · d9fd0a8
2 parents 0877241 + 61b9df5
commit d9fd0a8
Show file tree

Hide file tree

Showing 101 changed files with 1,362 additions and 1,568 deletions.
diff --git a/cmd/abapAddonAssemblyKitCheck.go b/cmd/abapAddonAssemblyKitCheck.go
@@ -11,14 +11,16 @@ import (
 
 func abapAddonAssemblyKitCheck(config abapAddonAssemblyKitCheckOptions, telemetryData *telemetry.CustomData, commonPipelineEnvironment *abapAddonAssemblyKitCheckCommonPipelineEnvironment) {
 	utils := aakaas.NewAakBundle()
+	telemetryData.BuildTool = "AAKaaS"
 
-	err := runAbapAddonAssemblyKitCheck(&config, telemetryData, utils, commonPipelineEnvironment)
+	err := runAbapAddonAssemblyKitCheck(&config, utils, commonPipelineEnvironment)
 	if err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
 
-func runAbapAddonAssemblyKitCheck(config *abapAddonAssemblyKitCheckOptions, telemetryData *telemetry.CustomData, utils aakaas.AakUtils, commonPipelineEnvironment *abapAddonAssemblyKitCheckCommonPipelineEnvironment) error {
+func runAbapAddonAssemblyKitCheck(config *abapAddonAssemblyKitCheckOptions, utils aakaas.AakUtils, commonPipelineEnvironment *abapAddonAssemblyKitCheckCommonPipelineEnvironment) error {
 
 	log.Entry().Info("╔═══════════════════════════╗")
 	log.Entry().Info("║ abapAddonAssemblyKitCheck ║")

diff --git a/cmd/abapAddonAssemblyKitCheckCVs.go b/cmd/abapAddonAssemblyKitCheckCVs.go
@@ -11,12 +11,14 @@ import (
 
 func abapAddonAssemblyKitCheckCVs(config abapAddonAssemblyKitCheckCVsOptions, telemetryData *telemetry.CustomData, cpe *abapAddonAssemblyKitCheckCVsCommonPipelineEnvironment) {
 	utils := aakaas.NewAakBundle()
-	if err := runAbapAddonAssemblyKitCheckCVs(&config, telemetryData, &utils, cpe); err != nil {
+	telemetryData.BuildTool = "AAKaaS"
+	if err := runAbapAddonAssemblyKitCheckCVs(&config, &utils, cpe); err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
 
-func runAbapAddonAssemblyKitCheckCVs(config *abapAddonAssemblyKitCheckCVsOptions, telemetryData *telemetry.CustomData, utils *aakaas.AakUtils, cpe *abapAddonAssemblyKitCheckCVsCommonPipelineEnvironment) error {
+func runAbapAddonAssemblyKitCheckCVs(config *abapAddonAssemblyKitCheckCVsOptions, utils *aakaas.AakUtils, cpe *abapAddonAssemblyKitCheckCVsCommonPipelineEnvironment) error {
 
 	log.Entry().Info("╔══════════════════════════════╗")
 	log.Entry().Info("║ abapAddonAssemblyKitCheckCVs ║")

diff --git a/cmd/abapAddonAssemblyKitCheckCVs_test.go b/cmd/abapAddonAssemblyKitCheckCVs_test.go
@@ -22,7 +22,7 @@ func TestCheckCVsStep(t *testing.T) {
 	config.Password = "dummyPassword"
 	t.Run("step success", func(t *testing.T) {
 		config.AddonDescriptorFileName = "success"
-		err := runAbapAddonAssemblyKitCheckCVs(&config, nil, &utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckCVs(&config, &utils, &cpe)
 		assert.NoError(t, err, "Did not expect error")
 		var addonDescriptorFinal abaputils.AddonDescriptor
 		err = json.Unmarshal([]byte(cpe.abap.addonDescriptor), &addonDescriptorFinal)
@@ -34,21 +34,21 @@ func TestCheckCVsStep(t *testing.T) {
 	})
 	t.Run("step error - in validate(no CommitID)", func(t *testing.T) {
 		config.AddonDescriptorFileName = "noCommitID"
-		err := runAbapAddonAssemblyKitCheckCVs(&config, nil, &utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckCVs(&config, &utils, &cpe)
 		assert.Error(t, err, "Must end with error")
 		assert.Contains(t, err.Error(), "CommitID missing in repo")
 	})
 	t.Run("step error - in ReadAddonDescriptor", func(t *testing.T) {
 		config.AddonDescriptorFileName = "failing"
-		err := runAbapAddonAssemblyKitCheckCVs(&config, nil, &utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckCVs(&config, &utils, &cpe)
 		assert.Error(t, err, "Must end with error")
 		assert.Contains(t, "error in ReadAddonDescriptor", err.Error())
 	})
 	t.Run("step error - in validate", func(t *testing.T) {
 		config.AddonDescriptorFileName = "success"
 		bundle.SetBody("ErrorBody")
 		bundle.SetError("error during validation")
-		err := runAbapAddonAssemblyKitCheckCVs(&config, nil, &utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckCVs(&config, &utils, &cpe)
 		assert.Error(t, err, "Must end with error")
 	})
 }

diff --git a/cmd/abapAddonAssemblyKitCheckPV.go b/cmd/abapAddonAssemblyKitCheckPV.go
@@ -11,12 +11,13 @@ import (
 
 func abapAddonAssemblyKitCheckPV(config abapAddonAssemblyKitCheckPVOptions, telemetryData *telemetry.CustomData, cpe *abapAddonAssemblyKitCheckPVCommonPipelineEnvironment) {
 	utils := aakaas.NewAakBundle()
-	// error situations should stop execution through log.Entry().Fatal() call which leads to an os.Exit(1) in the end
-	if err := runAbapAddonAssemblyKitCheckPV(&config, telemetryData, utils, cpe); err != nil {
+	telemetryData.BuildTool = "AAKaaS"
+	if err := runAbapAddonAssemblyKitCheckPV(&config, utils, cpe); err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
-func runAbapAddonAssemblyKitCheckPV(config *abapAddonAssemblyKitCheckPVOptions, telemetryData *telemetry.CustomData, utils aakaas.AakUtils, cpe *abapAddonAssemblyKitCheckPVCommonPipelineEnvironment) error {
+func runAbapAddonAssemblyKitCheckPV(config *abapAddonAssemblyKitCheckPVOptions, utils aakaas.AakUtils, cpe *abapAddonAssemblyKitCheckPVCommonPipelineEnvironment) error {
 
 	log.Entry().Info("╔═════════════════════════════╗")
 	log.Entry().Info("║ abapAddonAssemblyKitCheckPV ║")

diff --git a/cmd/abapAddonAssemblyKitCheckPV_test.go b/cmd/abapAddonAssemblyKitCheckPV_test.go
@@ -22,7 +22,7 @@ func TestCheckPVStep(t *testing.T) {
 	config.Password = "dummyPassword"
 	t.Run("step success", func(t *testing.T) {
 		config.AddonDescriptorFileName = "success"
-		err := runAbapAddonAssemblyKitCheckPV(&config, nil, utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckPV(&config, utils, &cpe)
 		assert.NoError(t, err, "Did not expect error")
 		var addonDescriptorFinal abaputils.AddonDescriptor
 		err = json.Unmarshal([]byte(cpe.abap.addonDescriptor), &addonDescriptorFinal)
@@ -33,15 +33,15 @@ func TestCheckPVStep(t *testing.T) {
 	})
 	t.Run("step error - in ReadAddonDescriptor", func(t *testing.T) {
 		config.AddonDescriptorFileName = "failing"
-		err := runAbapAddonAssemblyKitCheckPV(&config, nil, utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckPV(&config, utils, &cpe)
 		assert.Error(t, err, "Did expect error")
 		assert.Equal(t, err.Error(), "error in ReadAddonDescriptor")
 	})
 	t.Run("step error - in validate", func(t *testing.T) {
 		config.AddonDescriptorFileName = "success"
 		bundle.SetBody("ErrorBody")
 		bundle.SetError("error during validation")
-		err := runAbapAddonAssemblyKitCheckPV(&config, nil, utils, &cpe)
+		err := runAbapAddonAssemblyKitCheckPV(&config, utils, &cpe)
 		assert.Error(t, err, "Did expect error")
 	})
 }
diff --git a/cmd/abapAddonAssemblyKitCheck_generated.go b/cmd/abapAddonAssemblyKitCheck_generated.go
diff --git a/cmd/abapAddonAssemblyKitCheck_test.go b/cmd/abapAddonAssemblyKitCheck_test.go
@@ -37,7 +37,7 @@ func TestRunAbapAddonAssemblyKitCheck(t *testing.T) {
 			},
 		}
 
-		err := runAbapAddonAssemblyKitCheck(&config, nil, utils, &cpe)
+		err := runAbapAddonAssemblyKitCheck(&config, utils, &cpe)
 
 		assert.NoError(t, err)
 	})
@@ -53,7 +53,7 @@ func TestRunAbapAddonAssemblyKitCheck(t *testing.T) {
 			},
 		}
 
-		err := runAbapAddonAssemblyKitCheck(&config, nil, utils, &cpe)
+		err := runAbapAddonAssemblyKitCheck(&config, utils, &cpe)
 
 		assert.EqualError(t, err, "addonDescriptor must contain at least one software component repository")
 	})

diff --git a/cmd/abapAddonAssemblyKitCreateTargetVector.go b/cmd/abapAddonAssemblyKitCreateTargetVector.go
@@ -19,15 +19,17 @@ func abapAddonAssemblyKitCreateTargetVector(config abapAddonAssemblyKitCreateTar
 	c.Stderr(log.Writer())
 
 	client := piperhttp.Client{}
+	telemetryData.BuildTool = "AAKaaS"
 
 	// error situations should stop execution through log.Entry().Fatal() call which leads to an os.Exit(1) in the end
-	err := runAbapAddonAssemblyKitCreateTargetVector(&config, telemetryData, &client, cpe)
+	err := runAbapAddonAssemblyKitCreateTargetVector(&config, &client, cpe)
 	if err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
 
-func runAbapAddonAssemblyKitCreateTargetVector(config *abapAddonAssemblyKitCreateTargetVectorOptions, telemetryData *telemetry.CustomData, client piperhttp.Sender, cpe *abapAddonAssemblyKitCreateTargetVectorCommonPipelineEnvironment) error {
+func runAbapAddonAssemblyKitCreateTargetVector(config *abapAddonAssemblyKitCreateTargetVectorOptions, client piperhttp.Sender, cpe *abapAddonAssemblyKitCreateTargetVectorCommonPipelineEnvironment) error {
 	conn := new(abapbuild.Connector)
 	if err := conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, client, config.AbapAddonAssemblyKitOriginHash, config.AbapAddonAssemblyKitCertificateFile, config.AbapAddonAssemblyKitCertificatePass); err != nil {
 		return err

diff --git a/cmd/abapAddonAssemblyKitCreateTargetVector_test.go b/cmd/abapAddonAssemblyKitCreateTargetVector_test.go
@@ -45,7 +45,7 @@ func TestCreateTargetVectorStep(t *testing.T) {
 
 	t.Run("step success test", func(t *testing.T) {
 		//act
-		err := runAbapAddonAssemblyKitCreateTargetVector(&config, nil, client, &cpe)
+		err := runAbapAddonAssemblyKitCreateTargetVector(&config, client, &cpe)
 		//assert
 		assert.NoError(t, err, "Did not expect error")
 
@@ -62,7 +62,7 @@ func TestCreateTargetVectorStep(t *testing.T) {
 			Error: errors.New("dummy"),
 		}
 		//act
-		err := runAbapAddonAssemblyKitCreateTargetVector(&config, nil, client, &cpe)
+		err := runAbapAddonAssemblyKitCreateTargetVector(&config, client, &cpe)
 		//assert
 		assert.Error(t, err, "Must end with error")
 	})
@@ -77,7 +77,7 @@ func TestCreateTargetVectorStep(t *testing.T) {
 		adoDesc, _ := json.Marshal(addonDescriptor)
 		config.AddonDescriptor = string(adoDesc)
 		//act
-		err := runAbapAddonAssemblyKitCreateTargetVector(&config, nil, client, &cpe)
+		err := runAbapAddonAssemblyKitCreateTargetVector(&config, client, &cpe)
 		//assert
 		assert.Error(t, err, "Must end with error")
 	})
@@ -104,7 +104,7 @@ func TestCreateTargetVectorStep(t *testing.T) {
 		adoDesc, _ := json.Marshal(addonDescriptor)
 		config.AddonDescriptor = string(adoDesc)
 		//act
-		err := runAbapAddonAssemblyKitCreateTargetVector(&config, nil, client, &cpe)
+		err := runAbapAddonAssemblyKitCreateTargetVector(&config, client, &cpe)
 		//assert
 		assert.Error(t, err, "Must end with error")
 	})

diff --git a/cmd/abapAddonAssemblyKitPublishTargetVector.go b/cmd/abapAddonAssemblyKitPublishTargetVector.go
@@ -13,14 +13,15 @@ import (
 
 func abapAddonAssemblyKitPublishTargetVector(config abapAddonAssemblyKitPublishTargetVectorOptions, telemetryData *telemetry.CustomData) {
 	utils := aakaas.NewAakBundleWithTime(time.Duration(config.MaxRuntimeInMinutes), time.Duration(config.PollingIntervalInSeconds))
+	telemetryData.BuildTool = "AAKaaS"
 
-	// error situations should stop execution through log.Entry().Fatal() call which leads to an os.Exit(1) in the end
-	if err := runAbapAddonAssemblyKitPublishTargetVector(&config, telemetryData, &utils); err != nil {
+	if err := runAbapAddonAssemblyKitPublishTargetVector(&config, &utils); err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
 
-func runAbapAddonAssemblyKitPublishTargetVector(config *abapAddonAssemblyKitPublishTargetVectorOptions, telemetryData *telemetry.CustomData, utils *aakaas.AakUtils) error {
+func runAbapAddonAssemblyKitPublishTargetVector(config *abapAddonAssemblyKitPublishTargetVectorOptions, utils *aakaas.AakUtils) error {
 
 	conn := new(abapbuild.Connector)
 	if err := conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, *utils, config.AbapAddonAssemblyKitOriginHash, config.AbapAddonAssemblyKitCertificateFile, config.AbapAddonAssemblyKitCertificatePass); err != nil {

diff --git a/cmd/abapAddonAssemblyKitPublishTargetVector_generated.go b/cmd/abapAddonAssemblyKitPublishTargetVector_generated.go
diff --git a/cmd/abapAddonAssemblyKitPublishTargetVector_test.go b/cmd/abapAddonAssemblyKitPublishTargetVector_test.go
@@ -37,7 +37,7 @@ func TestPublishTargetVectorStep(t *testing.T) {
 		utils := bundle.GetUtils()
 
 		//act
-		err := runAbapAddonAssemblyKitPublishTargetVector(&config, nil, &utils)
+		err := runAbapAddonAssemblyKitPublishTargetVector(&config, &utils)
 		//assert
 		assert.NoError(t, err, "Did not expect error")
 	})
@@ -54,7 +54,7 @@ func TestPublishTargetVectorStep(t *testing.T) {
 		utils := bundle.GetUtils()
 
 		//act
-		err := runAbapAddonAssemblyKitPublishTargetVector(&config, nil, &utils)
+		err := runAbapAddonAssemblyKitPublishTargetVector(&config, &utils)
 		//assert
 		assert.NoError(t, err, "Did not expect error")
 	})
@@ -67,7 +67,7 @@ func TestPublishTargetVectorStep(t *testing.T) {
 		utils := bundle.GetUtils()
 
 		//act
-		err := runAbapAddonAssemblyKitPublishTargetVector(&config, nil, &utils)
+		err := runAbapAddonAssemblyKitPublishTargetVector(&config, &utils)
 		//assert
 		assert.Error(t, err, "Must end with error")
 	})
@@ -80,7 +80,7 @@ func TestPublishTargetVectorStep(t *testing.T) {
 		utils := bundle.GetUtils()
 
 		//act
-		err := runAbapAddonAssemblyKitPublishTargetVector(&config, nil, &utils)
+		err := runAbapAddonAssemblyKitPublishTargetVector(&config, &utils)
 		//assert
 		assert.Error(t, err, "Must end with error")
 	})

diff --git a/cmd/abapAddonAssemblyKitRegisterPackages.go b/cmd/abapAddonAssemblyKitRegisterPackages.go
@@ -23,15 +23,15 @@ func abapAddonAssemblyKitRegisterPackages(config abapAddonAssemblyKitRegisterPac
 	c.Stderr(log.Writer())
 
 	client := piperhttp.Client{}
+	telemetryData.BuildTool = "AAKaaS"
 
-	// error situations should stop execution through log.Entry().Fatal() call which leads to an os.Exit(1) in the end
-	err := runAbapAddonAssemblyKitRegisterPackages(&config, telemetryData, &client, cpe, reader)
-	if err != nil {
+	if err := runAbapAddonAssemblyKitRegisterPackages(&config, &client, cpe, reader); err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
 
-func runAbapAddonAssemblyKitRegisterPackages(config *abapAddonAssemblyKitRegisterPackagesOptions, telemetryData *telemetry.CustomData, client piperhttp.Sender,
+func runAbapAddonAssemblyKitRegisterPackages(config *abapAddonAssemblyKitRegisterPackagesOptions, client piperhttp.Sender,
 	cpe *abapAddonAssemblyKitRegisterPackagesCommonPipelineEnvironment, fileReader readFile) error {
 
 	var addonDescriptor abaputils.AddonDescriptor

diff --git a/cmd/abapAddonAssemblyKitRegisterPackages_test.go b/cmd/abapAddonAssemblyKitRegisterPackages_test.go
@@ -47,7 +47,7 @@ func TestRegisterPackagesStep(t *testing.T) {
 		}
 		adoDesc, _ := json.Marshal(addonDescriptor)
 		config.AddonDescriptor = string(adoDesc)
-		err := runAbapAddonAssemblyKitRegisterPackages(&config, nil, client, &cpe, mockReader)
+		err := runAbapAddonAssemblyKitRegisterPackages(&config, client, &cpe, mockReader)
 
 		assert.NoError(t, err, "Did not expect error")
 		var addonDescriptorFinal abaputils.AddonDescriptor
@@ -70,7 +70,7 @@ func TestRegisterPackagesStep(t *testing.T) {
 		}
 		adoDesc, _ := json.Marshal(addonDescriptor)
 		config.AddonDescriptor = string(adoDesc)
-		err := runAbapAddonAssemblyKitRegisterPackages(&config, nil, client, &cpe, mockReader)
+		err := runAbapAddonAssemblyKitRegisterPackages(&config, client, &cpe, mockReader)
 
 		assert.Error(t, err, "Did expect error")
 	})
@@ -90,7 +90,7 @@ func TestRegisterPackagesStep(t *testing.T) {
 		}
 		adoDesc, _ := json.Marshal(addonDescriptor)
 		config.AddonDescriptor = string(adoDesc)
-		err := runAbapAddonAssemblyKitRegisterPackages(&config, nil, client, &cpe, mockReader)
+		err := runAbapAddonAssemblyKitRegisterPackages(&config, client, &cpe, mockReader)
 		assert.Error(t, err, "Did expect error")
 	})
 	t.Run("step error - registerPackages - invalid input", func(t *testing.T) {
@@ -107,7 +107,7 @@ func TestRegisterPackagesStep(t *testing.T) {
 		}
 		adoDesc, _ := json.Marshal(addonDescriptor)
 		config.AddonDescriptor = string(adoDesc)
-		err := runAbapAddonAssemblyKitRegisterPackages(&config, nil, client, &cpe, mockReader)
+		err := runAbapAddonAssemblyKitRegisterPackages(&config, client, &cpe, mockReader)
 		assert.Error(t, err, "Did expect error")
 	})
 }

diff --git a/cmd/abapAddonAssemblyKitReleasePackages.go b/cmd/abapAddonAssemblyKitReleasePackages.go
@@ -14,14 +14,15 @@ import (
 
 func abapAddonAssemblyKitReleasePackages(config abapAddonAssemblyKitReleasePackagesOptions, telemetryData *telemetry.CustomData, cpe *abapAddonAssemblyKitReleasePackagesCommonPipelineEnvironment) {
 	utils := aakaas.NewAakBundleWithTime(time.Duration(config.MaxRuntimeInMinutes), time.Duration(config.PollingIntervalInSeconds))
+	telemetryData.BuildTool = "AAKaaS"
 
-	// error situations should stop execution through log.Entry().Fatal() call which leads to an os.Exit(1) in the end
-	if err := runAbapAddonAssemblyKitReleasePackages(&config, telemetryData, &utils, cpe); err != nil {
+	if err := runAbapAddonAssemblyKitReleasePackages(&config, &utils, cpe); err != nil {
+		telemetryData.ErrorCode = err.Error()
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}
 }
 
-func runAbapAddonAssemblyKitReleasePackages(config *abapAddonAssemblyKitReleasePackagesOptions, telemetryData *telemetry.CustomData, utils *aakaas.AakUtils,
+func runAbapAddonAssemblyKitReleasePackages(config *abapAddonAssemblyKitReleasePackagesOptions, utils *aakaas.AakUtils,
 	cpe *abapAddonAssemblyKitReleasePackagesCommonPipelineEnvironment) error {
 	conn := new(abapbuild.Connector)
 	if err := conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, *utils, config.AbapAddonAssemblyKitOriginHash, config.AbapAddonAssemblyKitCertificateFile, config.AbapAddonAssemblyKitCertificatePass); err != nil {