update qovery api

Qovery · Jun 12, 2024 · 4d5a433 · 4d5a433
1 parent 587e882
commit 4d5a433
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 25 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
 	github.com/pkg/errors v0.9.1
-	github.com/qovery/qovery-client-go v0.0.0-20240606122650-f81239366854
+	github.com/qovery/qovery-client-go v0.0.0-20240611152527-5b39ca9f2845
 	github.com/schollz/progressbar/v3 v3.13.0
 	github.com/sethvargo/go-envconfig v0.9.0
 	github.com/stretchr/testify v1.9.0

diff --git a/go.sum b/go.sum
@@ -422,6 +422,10 @@ github.com/qovery/qovery-client-go v0.0.0-20240606072918-84193eaca1eb h1:cnUhdm1
 github.com/qovery/qovery-client-go v0.0.0-20240606072918-84193eaca1eb/go.mod h1:9eHj5a4EtXGIyfbvVL3HVYW9k7Xmiwi00OqHrP4dc10=
 github.com/qovery/qovery-client-go v0.0.0-20240606122650-f81239366854 h1:vC36OebDwE6Nvm5N3A4Uw/uYVqincEizQiQ8bMPIyZI=
 github.com/qovery/qovery-client-go v0.0.0-20240606122650-f81239366854/go.mod h1:9eHj5a4EtXGIyfbvVL3HVYW9k7Xmiwi00OqHrP4dc10=
+github.com/qovery/qovery-client-go v0.0.0-20240611083328-d7adb716fa27 h1:numpn1UJbkU46fJHioXwmvzpKI36htEKuZ5NyY9JBLE=
+github.com/qovery/qovery-client-go v0.0.0-20240611083328-d7adb716fa27/go.mod h1:9eHj5a4EtXGIyfbvVL3HVYW9k7Xmiwi00OqHrP4dc10=
+github.com/qovery/qovery-client-go v0.0.0-20240611152527-5b39ca9f2845 h1:x7cDoxl+y9Wba9aumkGek3mIn7byyAk3QRrqhzsQ3pw=
+github.com/qovery/qovery-client-go v0.0.0-20240611152527-5b39ca9f2845/go.mod h1:9eHj5a4EtXGIyfbvVL3HVYW9k7Xmiwi00OqHrP4dc10=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=

diff --git a/internal/infrastructure/repositories/qoveryapi/helm_qoveryapi_models.go b/internal/infrastructure/repositories/qoveryapi/helm_qoveryapi_models.go
@@ -29,14 +29,10 @@ type AggregateHelmResponse struct {
 
 func getAggregateHelmResponse(helmResponse *qovery.HelmResponse) AggregateHelmResponse {
 	source := helm.SourceResponse{}
-	if git := helmResponse.Source["git"]; git != nil {
-		ret := qovery.HelmSourceGitResponse{}
-		_ = unmarshal(git, &ret)
-		source.Git = &ret
-	} else if repo := helmResponse.Source["repository"]; repo != nil {
-		ret := qovery.HelmSourceRepositoryResponse{}
-		_ = unmarshal(repo, &ret)
-		source.Repository = &ret
+	if git := helmResponse.Source.HelmResponseAllOfSourceOneOf; git != nil {
+		source.Git = &git.Git
+	} else if repo := helmResponse.Source.HelmResponseAllOfSourceOneOf1; repo != nil {
+		source.Repository = &repo.Repository
 	}
 
 	return AggregateHelmResponse{

diff --git a/internal/infrastructure/repositories/qoveryapi/job_qoveryapi_models.go b/internal/infrastructure/repositories/qoveryapi/job_qoveryapi_models.go
@@ -48,14 +48,10 @@ func unmarshal[T any](input interface{}, output *T) error {
 func getAggregateJobResponse(jobResponse *qovery.JobResponse) AggregateJobResponse {
 	source := job.SourceResponse{}
 	if jobResponse.CronJobResponse != nil {
-		if jobResponse.CronJobResponse.Source["image"] != nil {
-			ret := qovery.ContainerSource{}
-			_ = unmarshal(jobResponse.CronJobResponse.Source["image"], &ret)
-			source.Image = &ret
-		} else if jobResponse.CronJobResponse.Source["docker"] != nil {
-			ret := qovery.JobSourceDockerResponse{}
-			_ = unmarshal(jobResponse.CronJobResponse.Source["docker"], &ret)
-			source.Docker = &ret
+		if jobResponse.CronJobResponse.Source.BaseJobResponseAllOfSourceOneOf != nil {
+			source.Image = &jobResponse.CronJobResponse.Source.BaseJobResponseAllOfSourceOneOf.Image
+		} else if jobResponse.LifecycleJobResponse.Source.BaseJobResponseAllOfSourceOneOf1 != nil {
+			source.Docker = &jobResponse.LifecycleJobResponse.Source.BaseJobResponseAllOfSourceOneOf1.Docker
 		}
 
 		return AggregateJobResponse{
@@ -80,14 +76,10 @@ func getAggregateJobResponse(jobResponse *qovery.JobResponse) AggregateJobRespon
 			ScheduleCron:       &jobResponse.CronJobResponse.Schedule,
 		}
 	} else {
-		if jobResponse.LifecycleJobResponse.Source["image"] != nil {
-			ret := qovery.ContainerSource{}
-			_ = unmarshal(jobResponse.LifecycleJobResponse.Source["image"], &ret)
-			source.Image = &ret
-		} else if jobResponse.LifecycleJobResponse.Source["docker"] != nil {
-			ret := qovery.JobSourceDockerResponse{}
-			_ = unmarshal(jobResponse.LifecycleJobResponse.Source["docker"], &ret)
-			source.Docker = &ret
+		if jobResponse.LifecycleJobResponse.Source.BaseJobResponseAllOfSourceOneOf != nil {
+			source.Image = &jobResponse.LifecycleJobResponse.Source.BaseJobResponseAllOfSourceOneOf.Image
+		} else if jobResponse.LifecycleJobResponse.Source.BaseJobResponseAllOfSourceOneOf1 != nil {
+			source.Docker = &jobResponse.LifecycleJobResponse.Source.BaseJobResponseAllOfSourceOneOf1.Docker
 		}
 		return AggregateJobResponse{
 			Id:                 jobResponse.LifecycleJobResponse.Id,