From 19bcfdd8dfd7999237c808b5c2e0bf497da57623 Mon Sep 17 00:00:00 2001 From: Zheng Xi Zhou Date: Thu, 9 Sep 2021 17:19:57 +0800 Subject: [PATCH] Fix: bump version of Terraform Controller (#2250) Bumped the version of Terraform controller to change the filed of Configuration's status. Related issue: https://github.com/oam-dev/terraform-controller/pull/104 --- go.mod | 2 +- go.sum | 4 ++-- pkg/controller/core.oam.dev/v1alpha2/application/apply.go | 4 ++-- .../core.oam.dev/v1alpha2/application/apply_test.go | 2 +- .../v1alpha2/core/scopes/healthscope/healthscope.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 8087d5f2c..235c1a50f 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/mholt/archiver/v3 v3.3.0 github.com/mitchellh/hashstructure/v2 v2.0.1 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 - github.com/oam-dev/terraform-controller v0.1.16 + github.com/oam-dev/terraform-controller v0.1.18 github.com/olekukonko/tablewriter v0.0.4 github.com/onsi/ginkgo v1.16.4 github.com/onsi/gomega v1.14.0 diff --git a/go.sum b/go.sum index 9bd38b4c5..a06b75f60 100644 --- a/go.sum +++ b/go.sum @@ -1055,8 +1055,8 @@ github.com/oam-dev/stern v1.13.0-alpha h1:EVjM8Qvh6LssB6t4RZrjf9DtCq1cz+/cy6OF7f github.com/oam-dev/stern v1.13.0-alpha/go.mod h1:AOkvfFUv0Arz7GBi0jz7S0Jsu4K/kdvSjNsnRt1+BIg= github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 h1:tD8HiFKnt0jnwdTWjeqUnfnUYLD/+Nsmj8ZGIxqDWiU= github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28/go.mod h1:Mu8i0/DdplvnjwRbAYPsc8+LRR27n/mp8VWdkN10GzE= -github.com/oam-dev/terraform-controller v0.1.16 h1:EcJnHui7eLfVKDYndZR9xIq9wXb/86+okcHIbi4vPDg= -github.com/oam-dev/terraform-controller v0.1.16/go.mod h1:RMRlttrEOwWZawyDg3+ZtxAVGvTkCL+yMCTz94vkx/8= +github.com/oam-dev/terraform-controller v0.1.18 h1:64cWQUF5bJR4Y87oMPsyYr7Ra5miP22eIoNgeqEpN5A= +github.com/oam-dev/terraform-controller v0.1.18/go.mod h1:RMRlttrEOwWZawyDg3+ZtxAVGvTkCL+yMCTz94vkx/8= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= diff --git a/pkg/controller/core.oam.dev/v1alpha2/application/apply.go b/pkg/controller/core.oam.dev/v1alpha2/application/apply.go index 8ec6ab582..c9558d2f3 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/application/apply.go +++ b/pkg/controller/core.oam.dev/v1alpha2/application/apply.go @@ -170,13 +170,13 @@ func (h *AppHandler) aggregateHealthStatus(appFile *appfile.Appfile) ([]common.A if err := h.r.Client.Get(ctx, client.ObjectKey{Name: wl.Name, Namespace: h.app.Namespace}, &configuration); err != nil { return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, check health error", appFile.Name, wl.Name) } - if configuration.Status.State != terraformtypes.Available { + if configuration.Status.Apply.State != terraformtypes.Available { healthy = false status.Healthy = false } else { status.Healthy = true } - status.Message = configuration.Status.Message + status.Message = configuration.Status.Apply.Message default: pCtx = process.NewContext(h.app.Namespace, wl.Name, appFile.Name, appFile.RevisionName) if !h.isNewRevision && wl.CapabilityCategory != types.CUECategory { diff --git a/pkg/controller/core.oam.dev/v1alpha2/application/apply_test.go b/pkg/controller/core.oam.dev/v1alpha2/application/apply_test.go index dd7d23432..f8eabd157 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/application/apply_test.go +++ b/pkg/controller/core.oam.dev/v1alpha2/application/apply_test.go @@ -207,7 +207,7 @@ var _ = Describe("Test statusAggregate", func() { By("set status for Terraform configuration") var gotConfiguration terraformapi.Configuration k8sClient.Get(ctx, client.ObjectKey{Namespace: ns, Name: componentName}, &gotConfiguration) - gotConfiguration.Status.State = terraformtypes.Available + gotConfiguration.Status.Apply.State = terraformtypes.Available k8sClient.Status().Update(ctx, &gotConfiguration) By("aggregate status one more time") diff --git a/pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope/healthscope.go b/pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope/healthscope.go index e1ea5765c..12807dd61 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope/healthscope.go +++ b/pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope/healthscope.go @@ -505,12 +505,12 @@ func CUEBasedHealthCheck(ctx context.Context, c client.Client, wlRef core.Object wlHealth.HealthStatus = StatusUnhealthy wlHealth.Diagnosis = errors.Wrap(err, errHealthCheck).Error() } - if configuration.Status.State != terraformtypes.Available { + if configuration.Status.Apply.State != terraformtypes.Available { wlHealth.HealthStatus = StatusUnhealthy } else { wlHealth.HealthStatus = StatusHealthy } - wlHealth.Diagnosis = configuration.Status.Message + wlHealth.Diagnosis = configuration.Status.Apply.Message okToCheckTrait = true default: pCtx = process.NewContext(ns, wl.Name, appfile.Name, appfile.RevisionName)