AAKaaS: 2 Check Product Version

cmd/abapAddonAssemblyKitCheckCVs.go

@@ -40,7 +40,7 @@ func runAbapAddonAssemblyKitCheckCVs(config *abapAddonAssemblyKitCheckCVsOptions
 	conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, client)
 
 	for i := range addonDescriptor.Repositories {
-		var c cv
+		var c componentVersion
 		c.initCV(addonDescriptor.Repositories[i], *conn)
 		err := c.validate()
 		if err != nil {
@@ -60,40 +60,40 @@ func combineYAMLRepositoriesWithCPEProduct(addonDescriptor abaputils.AddonDescri
 	return addonDescriptorFromCPE
 }
 
-func (c *cv) initCV(repo abaputils.Repository, conn abapbuild.Connector) {
+func (c *componentVersion) initCV(repo abaputils.Repository, conn abapbuild.Connector) {
 	c.Connector = conn
 	c.Name = repo.Name
 	c.VersionYAML = repo.VersionYAML
 }
 
-func (c *cv) copyFieldsToRepo(initialRepo *abaputils.Repository) {
+func (c *componentVersion) copyFieldsToRepo(initialRepo *abaputils.Repository) {
 	initialRepo.Version = c.Version
 	initialRepo.SpLevel = c.SpLevel
 	initialRepo.PatchLevel = c.PatchLevel
 }
 
-func (c *cv) validate() error {
+func (c *componentVersion) validate() error {
 	log.Entry().Infof("Validate component %s version %s and resolve version", c.Name, c.VersionYAML)
 	appendum := "/odata/aas_ocs_package/ValidateComponentVersion?Name='" + c.Name + "'&Version='" + c.VersionYAML + "'"
 	body, err := c.Connector.Get(appendum)
 	if err != nil {
 		return err
 	}
-	var jCV jsonCV
+	var jCV jsonComponentVersion
 	json.Unmarshal(body, &jCV)
-	c.Name = jCV.CV.Name
-	c.Version = jCV.CV.Version
-	c.SpLevel = jCV.CV.SpLevel
-	c.PatchLevel = jCV.CV.PatchLevel
+	c.Name = jCV.ComponentVersion.Name
+	c.Version = jCV.ComponentVersion.Version
+	c.SpLevel = jCV.ComponentVersion.SpLevel
+	c.PatchLevel = jCV.ComponentVersion.PatchLevel
 	log.Entry().Infof("Resolved version %s, splevel %s, patchlevel %s", c.Version, c.SpLevel, c.PatchLevel)
 	return nil
 }
 
-type jsonCV struct {
-	CV *cv `json:"d"`
+type jsonComponentVersion struct {
+	ComponentVersion *componentVersion `json:"d"`
 }
 
-type cv struct {
+type componentVersion struct {
 	abapbuild.Connector
 	Name        string `json:"Name"`
 	VersionYAML string

cmd/abapAddonAssemblyKitCheckCVs_test.go

@@ -76,7 +76,7 @@ func TestInitCV(t *testing.T) {
 			Name:        "/DRNMSPC/COMP01",
 			VersionYAML: "1.2.3",
 		}
-		var c cv
+		var c componentVersion
 		c.initCV(repo, *conn)
 		assert.Equal(t, "/DRNMSPC/COMP01", c.Name)
 		assert.Equal(t, "1.2.3", c.VersionYAML)
@@ -89,7 +89,7 @@ func TestValidateCV(t *testing.T) {
 		conn.Client = &abaputils.ClientMock{
 			Body: responseCheckCVs,
 		}
-		c := cv{
+		c := componentVersion{
 			Connector:   *conn,
 			Name:        "/DRNMSPC/COMP01",
 			VersionYAML: "1.2.3",
@@ -108,7 +108,7 @@ func TestValidateCV(t *testing.T) {
 			Body:  "ErrorBody",
 			Error: errors.New("Validation failed"),
 		}
-		c := cv{
+		c := componentVersion{
 			Connector:   *conn,
 			Name:        "/DRNMSPC/COMP01",
 			VersionYAML: "1.2.3",
@@ -127,7 +127,7 @@ func TestCopyFieldsCV(t *testing.T) {
 			Name:        "/DRNMSPC/COMP01",
 			VersionYAML: "1.2.3",
 		}
-		var c cv
+		var c componentVersion
 		c.Version = "0001"
 		c.SpLevel = "0002"
 		c.PatchLevel = "0003"

cmd/abapAddonAssemblyKitCheckPV.go

@@ -0,0 +1,96 @@
+package cmd
+
+import (
+	"encoding/json"
+
+	abapbuild "github.com/SAP/jenkins-library/pkg/abap/build"
+	"github.com/SAP/jenkins-library/pkg/abaputils"
+	"github.com/SAP/jenkins-library/pkg/command"
+	piperhttp "github.com/SAP/jenkins-library/pkg/http"
+	"github.com/SAP/jenkins-library/pkg/log"
+	"github.com/SAP/jenkins-library/pkg/telemetry"
+)
+
+func abapAddonAssemblyKitCheckPV(config abapAddonAssemblyKitCheckPVOptions, telemetryData *telemetry.CustomData, cpe *abapAddonAssemblyKitCheckPVCommonPipelineEnvironment) {
+	// for command execution use Command
+	c := command.Command{}
+	// reroute command output to logging framework
+	c.Stdout(log.Writer())
+	c.Stderr(log.Writer())
+
+	client := piperhttp.Client{}
+
+	// error situations should stop execution through log.Entry().Fatal() call which leads to an os.Exit(1) in the end
+	err := runAbapAddonAssemblyKitCheckPV(&config, telemetryData, &client, cpe, abaputils.ReadAddonDescriptor)
+	if err != nil {
+		log.Entry().WithError(err).Fatal("step execution failed")
+	}
+}
+
+func runAbapAddonAssemblyKitCheckPV(config *abapAddonAssemblyKitCheckPVOptions, telemetryData *telemetry.CustomData, client piperhttp.Sender,
+	cpe *abapAddonAssemblyKitCheckPVCommonPipelineEnvironment, readAdoDescriptor abaputils.ReadAddonDescriptorType) error {
+	var addonDescriptorFromCPE abaputils.AddonDescriptor
+	json.Unmarshal([]byte(config.AddonDescriptor), &addonDescriptorFromCPE)
+	addonDescriptor, err := readAdoDescriptor(config.AddonDescriptorFileName)
+	addonDescriptor = combineYAMLRepositoriesWithCPEProduct(addonDescriptor, addonDescriptorFromCPE)
+	if err != nil {
+		return err
+	}
+	conn := new(abapbuild.Connector)
+	conn.InitAAKaaS(config.AbapAddonAssemblyKitEndpoint, config.Username, config.Password, client)
+
+	var p productVersion
+	p.init(addonDescriptor, *conn)
+	err = p.validate()
+	if err != nil {
+		return err
+	}
+	p.copyFieldsToRepo(&addonDescriptor)
+	log.Entry().Info("Write the resolved version to the CommonPipelineEnvironment")
+	toCPE, _ := json.Marshal(addonDescriptor)
+	cpe.abap.addonDescriptor = string(toCPE)
+	return nil
+}
+
+func (p *productVersion) init(desc abaputils.AddonDescriptor, conn abapbuild.Connector) {
+	p.Connector = conn
+	p.Name = desc.AddonProduct
+	p.VersionYAML = desc.AddonVersionYAML
+}
+
+func (p *productVersion) copyFieldsToRepo(initialAddonDescriptor *abaputils.AddonDescriptor) {
+	initialAddonDescriptor.AddonVersion = p.Version
+	initialAddonDescriptor.AddonSpsLevel = p.SpsLevel
+	initialAddonDescriptor.AddonPatchLevel = p.PatchLevel
+}
+
+func (p *productVersion) validate() error {
+	log.Entry().Infof("Validate product %s version %s and resolve version", p.Name, p.VersionYAML)
+	appendum := "/odata/aas_ocs_package/ValidateProductVersion?Name='" + p.Name + "'&Version='" + p.VersionYAML + "'"
+	body, err := p.Connector.Get(appendum)
+	if err != nil {
+		return err
+	}
+	var jPV jsonProductVersion
+	json.Unmarshal(body, &jPV)
+	p.Name = jPV.ProductVersion.Name
+	p.Version = jPV.ProductVersion.Version
+	p.SpsLevel = jPV.ProductVersion.SpsLevel
+	p.PatchLevel = jPV.ProductVersion.PatchLevel
+	log.Entry().Infof("Resolved version %s, spslevel %s, patchlevel %s", p.Version, p.SpsLevel, p.PatchLevel)
+	return nil
+}
+
+type jsonProductVersion struct {
+	ProductVersion *productVersion `json:"d"`
+}
+
+type productVersion struct {
+	abapbuild.Connector
+	Name           string `json:"Name"`
+	VersionYAML    string
+	Version        string `json:"Version"`
+	SpsLevel       string `json:"SpsLevel"`
+	PatchLevel     string `json:"PatchLevel"`
+	TargetVectorID string
+}