Merge pull request #44 from swaroopar/feature/updateXpanseApi

update xpanse API version

Author: swaroopar

clientgen/api.json

@@ -23,19 +23,29 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/getkin/kin-openapi v0.127.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/invopop/yaml v0.3.1 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -45,11 +55,13 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect

go.mod

@@ -14,14 +14,14 @@ import (
 	"xpanse-agent/pkg/logger"
 )
 
-func createVirtualEnv(virtualEnvDir string, pythonVersion float32, moduleRequirementsFile string) error {
+func createVirtualEnv(virtualEnvDir string, pythonVersion string, moduleRequirementsFile string) error {
 	var cmd *exec.Cmd
 	var err error
 	// Check if the virtualenv already exists
 	if _, err = os.Stat(virtualEnvDir); !os.IsNotExist(err) {
 		logger.Logger.Info(fmt.Sprintf("Virtual environment '%s' already exists. Installing required modules on the same.", virtualEnvDir))
 	} else {
-		cmd = exec.Command(fmt.Sprintf("python%.2f", pythonVersion), "-m", "venv", virtualEnvDir)
+		cmd = exec.Command(fmt.Sprintf("python%s", pythonVersion), "-m", "venv", virtualEnvDir)
 		err = cmd.Run()
 	}
 	if err != nil {

go.sum

@@ -22,7 +22,7 @@ func RunPlaybook(playbookName string,
 	extraVars map[string]interface{},
 	inventory *map[string]interface{},
 	virtualEnvRootDir string,
-	pythonVersion float32,
+	pythonVersion string,
 	manageVirtualEnv bool,
 	requirementsFileNameInRepo string,
 	galaxyFile string) (*results.AnsiblePlaybookJSONResults, error) {

pkg/ansible/manage_virtual_env.go

@@ -15,7 +15,7 @@ func TestRunPlaybook(t *testing.T) {
 	err := config.LoadConfig("test_data/test-xpanse-agent-config.yml")
 	assert.Nil(t, err)
 	results, runError := RunPlaybook(
-		"kafka-container-manage.yml", nil, nil, "/tmp/kafka-test/", 3.10, true, "requirements.txt", "requirements.yml")
+		"kafka-container-manage.yml", nil, nil, "/tmp/kafka-test/", "3.10", true, "requirements.txt", "requirements.yml")
 	assert.Nil(t, runError)
 	assert.NotNil(t, results)
 }

pkg/ansible/run_playbook.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/google/uuid"
 	"net"
 	"net/http"
 	"os"
@@ -24,8 +25,13 @@ func PollXpanseApiAndExecuteChanges() error {
 		logger.Logger.Error(clientError.Error())
 	}
 
+	serviceIdUuid, err := uuid.Parse(config.LoadedConfig.ServiceId)
+	if err != nil {
+		return err
+	}
+
 	if c != nil {
-		resp, requestError := c.GetPendingConfigurationChangeRequestWithResponse(context.Background(), config.LoadedConfig.ServiceId, config.LoadedConfig.ResourceName)
+		resp, requestError := c.GetPendingServiceChangeRequestWithResponse(context.Background(), serviceIdUuid, config.LoadedConfig.ResourceName)
 		if requestError != nil {
 			var ne net.Error
 			if errors.As(requestError, &ne) && ne.Timeout() {
@@ -50,14 +56,14 @@ func PollXpanseApiAndExecuteChanges() error {
 
 		if resp.JSON400 != nil {
 			logger.Logger.Error(strings.Join(resp.JSON400.Details, ", "))
-			if resp.JSON400.ResultType == xpanseclient.ParametersInvalid {
+			if resp.JSON400.ErrorType == xpanseclient.ParametersInvalid {
 				logger.Logger.Error("Exiting agent. Agent not started with valid parameters")
 				os.Exit(1)
 			}
 		}
 		if resp.JSON400 != nil {
 			logger.Logger.Error(strings.Join(resp.JSON400.Details, ", "))
-			if resp.JSON400.ResultType == xpanseclient.ParametersInvalid {
+			if resp.JSON400.ErrorType == xpanseclient.ParametersInvalid {
 				logger.Logger.Error("Exiting agent. Agent not started with valid parameters")
 				os.Exit(1)
 			}

pkg/ansible/run_playbook_test.go

@@ -8,11 +8,12 @@ package executor
 import (
 	"context"
 	results "github.com/apenella/go-ansible/v2/pkg/execute/result/json"
+	"github.com/google/uuid"
 	"xpanse-agent/pkg/logger"
 	"xpanse-agent/pkg/xpanseclient"
 )
 
-func updateResultToXpanse(err error, ansibleOutput *results.AnsiblePlaybookJSONResults, changeId string) {
+func updateResultToXpanse(err error, ansibleOutput *results.AnsiblePlaybookJSONResults, changeId uuid.UUID) {
 	var isSuccessful bool
 	var errorString string
 	var tasks []xpanseclient.AnsibleTaskResult
@@ -37,9 +38,9 @@ func updateResultToXpanse(err error, ansibleOutput *results.AnsiblePlaybookJSONR
 						resultMessage = ""
 					}
 					tasks = append(tasks, xpanseclient.AnsibleTaskResult{
-						IsSuccessful: &(taskSuccessful),
+						IsSuccessful: taskSuccessful,
 						Message:      &resultMessage,
-						Name:         &name,
+						Name:         name,
 					})
 				}
 			}
@@ -52,16 +53,16 @@ func updateResultToXpanse(err error, ansibleOutput *results.AnsiblePlaybookJSONR
 	}
 
 	if c != nil {
-		resp, requestError := c.UpdateConfigurationChangeResult(context.Background(), changeId, xpanseclient.ServiceConfigurationChangeResult{
+		resp, requestError := c.UpdateServiceChangeResultWithResponse(context.Background(), changeId, xpanseclient.ServiceChangeResult{
 			Error:        &errorString,
-			IsSuccessful: &isSuccessful,
+			IsSuccessful: isSuccessful,
 			Tasks:        &tasks,
 		})
 		if requestError != nil {
 			logger.Logger.Error(requestError.Error())
 		}
 		if resp != nil {
-			logger.Logger.Info(resp.Status)
+			logger.Logger.Info(resp.Status())
 		}
 	}
 }

pkg/executor/api_poller.go

@@ -8,29 +8,30 @@ package executor
 import (
 	"fmt"
 	results "github.com/apenella/go-ansible/v2/pkg/execute/result/json"
+	"github.com/google/uuid"
 	"xpanse-agent/pkg/ansible"
 	"xpanse-agent/pkg/git"
 	"xpanse-agent/pkg/logger"
 	"xpanse-agent/pkg/xpanseclient"
 )
 
-func informPanicToXpanse(changeId string) {
+func informPanicToXpanse(changeId uuid.UUID) {
 	if r := recover(); r != nil {
 		panicError := fmt.Errorf("change request failed with error: %s", r)
 		logger.Logger.Error(panicError.Error())
 		updateResultToXpanse(panicError, nil, changeId)
 	}
 }
 
-func ConfigUpdate(request xpanseclient.ServiceConfigurationChangeRequest) error {
-	defer informPanicToXpanse(request.ChangeId.String())
+func ConfigUpdate(request xpanseclient.ServiceChangeRequest) error {
+	defer informPanicToXpanse(request.ChangeId)
 	var err error
 	var result *results.AnsiblePlaybookJSONResults
 	err = git.CloneRepository(request.AnsibleScriptConfig.RepoUrl,
 		request.AnsibleScriptConfig.Branch)
 	if err == nil {
 		result, err = ansible.RunPlaybook(request.AnsibleScriptConfig.PlaybookName,
-			*request.ConfigParameters,
+			request.ServiceChangeParameters,
 			request.AnsibleInventory,
 			request.AnsibleScriptConfig.VirtualEnv,
 			request.AnsibleScriptConfig.PythonVersion,
@@ -39,6 +40,6 @@ func ConfigUpdate(request xpanseclient.ServiceConfigurationChangeRequest) error
 			request.AnsibleScriptConfig.GalaxyFile,
 		)
 	}
-	updateResultToXpanse(err, result, request.ChangeId.String())
+	updateResultToXpanse(err, result, request.ChangeId)
 	return err
 }