freshworksinc · balu-ce · Feb 12, 2024 · Feb 12, 2024 · Feb 27, 2024 · Mar 1, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   ci:
     uses: upbound/official-providers-ci/.github/workflows/provider-ci.yml@main
     with:
-      go-version: "1.21"
+      go-version: "1.22"
       upjet-based-provider: false
     secrets:
       UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -8,7 +8,7 @@ jobs:
   e2e:
     uses: upbound/official-providers-ci/.github/workflows/pr-comment-trigger.yml@main
     with:
-      go-version: "1.21"
+      go-version: "1.22"
     secrets:
       UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }}
       UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -22,7 +22,7 @@ env:
 
 jobs:
   setup-vars:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       supported_releases_number: ${{ steps.setup.outputs.supported_releases_number }}
       images: ${{ steps.setup.outputs.images }}

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "build"]
 	path = build
-	url = https://github.com/upbound/build
+	url = https://github.com/crossplane/build
diff --git a/Makefile b/Makefile
@@ -29,6 +29,7 @@ GO111MODULE = on
 UP_VERSION = v0.28.0
 # UP_CHANNEL = stable
 UPTEST_VERSION = v0.5.0
+CROSSPLANE_VERSION = 1.16.0
 -include build/makelib/k8s_tools.mk
 
 # Setup Images
@@ -177,3 +178,6 @@ go.mod.cachedir:
 	@go env GOMODCACHE
 
 .PHONY: go.mod.cachedir
+
+vendor: modules.download
+vendor.check: modules.check
diff --git a/apis/v1beta1/workspace_types.go b/apis/v1beta1/workspace_types.go
@@ -39,14 +39,14 @@ const (
 	VarFileSourceSecretKey    VarFileSource = "SecretKey"
 )
 
-// A VarFileFormat specifies the format of a Terraform vars file.
+// A FileFormat specifies the format of a Terraform file.
 // +kubebuilder:validation:Enum=HCL;JSON
-type VarFileFormat string
+type FileFormat string
 
 // Vars file formats.
 var (
-	VarFileFormatHCL  VarFileFormat = "HCL"
-	VarFileFormatJSON VarFileFormat = "JSON"
+	FileFormatHCL  FileFormat = "HCL"
+	FileFormatJSON FileFormat = "JSON"
 )
 
 // A VarFile is a file containing many Terraform variables.
@@ -57,7 +57,7 @@ type VarFile struct {
 	// Format of this vars file.
 	// +kubebuilder:default=HCL
 	// +optional
-	Format *VarFileFormat `json:"format,omitempty"`
+	Format *FileFormat `json:"format,omitempty"`
 
 	// A ConfigMap key containing the vars file.
 	// +optional
@@ -108,9 +108,13 @@ type WorkspaceParameters struct {
 	// file. When the workspace's source is 'Remote' (the default) this can be
 	// any address supported by terraform init -from-module, for example a git
 	// repository or an S3 bucket. When the workspace's source is 'Inline' the
-	// content of a simple main.tf file may be written inline.
+	// content of a simple main.tf or main.tf.json file may be written inline.
 	Module string `json:"module"`
 
+	// Specifies the format of the inline Terraform content
+	// if Source is 'Inline'
+	InlineFormat FileFormat `json:"inlineFormat,omitempty"`
+
 	// Source of the root module of this workspace.
 	Source ModuleSource `json:"source"`
 
@@ -153,6 +157,10 @@ type WorkspaceParameters struct {
 
 	// Arguments to be included in the terraform destroy CLI command
 	DestroyArgs []string `json:"destroyArgs,omitempty"`
+
+	// Boolean value to indicate  CLI logging of terraform execution is enabled or not
+	// +optional
+	EnableTerraformCLILogging bool `json:"enableTerraformCLILogging,omitempty"`
 }
 
 // WorkspaceObservation are the observable fields of a Workspace.
@@ -182,6 +190,7 @@ type WorkspaceStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status"
 // +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
+// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,terraform}
 type Workspace struct {

diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go
diff --git a/build b/build
diff --git a/cluster/images/provider-terraform/Dockerfile b/cluster/images/provider-terraform/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.20.3
 RUN apk --no-cache add ca-certificates bash git curl
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/cmd/provider/main.go b/cmd/provider/main.go
@@ -25,6 +25,8 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/certificates"
 	"github.com/crossplane/crossplane-runtime/pkg/controller"
 	"github.com/crossplane/crossplane-runtime/pkg/feature"
+	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
+	"github.com/crossplane/crossplane-runtime/pkg/statemetrics"
 	"go.uber.org/zap/zapcore"
 
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
@@ -35,6 +37,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
@@ -53,6 +56,7 @@ func main() {
 		debug                      = app.Flag("debug", "Run with debug logging.").Short('d').Bool()
 		syncInterval               = app.Flag("sync", "Sync interval controls how often all resources will be double checked for drift.").Short('s').Default("1h").Duration()
 		pollInterval               = app.Flag("poll", "Poll interval controls how often an individual resource should be checked for drift.").Default("10m").Duration()
+		pollStateMetricInterval    = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration()
 		pollJitter                 = app.Flag("poll-jitter", "If non-zero, varies the poll interval by a random amount up to plus-or-minus this value.").Default("1m").Duration()
 		timeout                    = app.Flag("timeout", "Controls how long Terraform processes may run before they are killed.").Default("20m").Duration()
 		leaderElection             = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").Envar("LEADER_ELECTION").Bool()
@@ -101,12 +105,23 @@ func main() {
 
 	kingpin.FatalIfError(apis.AddToScheme(mgr.GetScheme()), "Cannot add terraform APIs to scheme")
 
+	metricRecorder := managed.NewMRMetricRecorder()
+	stateMetrics := statemetrics.NewMRStateMetrics()
+
+	metrics.Registry.MustRegister(metricRecorder)
+	metrics.Registry.MustRegister(stateMetrics)
+
 	o := controller.Options{
 		Logger:                  log,
 		MaxConcurrentReconciles: *maxReconcileRate,
 		PollInterval:            *pollInterval,
 		GlobalRateLimiter:       ratelimiter.NewGlobal(*maxReconcileRate),
 		Features:                &feature.Flags{},
+		MetricOptions: &controller.MetricOptions{
+			PollStateMetricInterval: *pollStateMetricInterval,
+			MRMetrics:               metricRecorder,
+			MRStateMetrics:          stateMetrics,
+		},
 	}
 
 	if *enableManagementPolicies {

diff --git a/docs/monolith/Configuration.md b/docs/monolith/Configuration.md
@@ -355,3 +355,25 @@ spec:
 At Vault side configuration is also needed to allow the write operation, see
 [example](https://docs.crossplane.io/knowledge-base/integrations/vault-as-secret-store/)
 here for inspiration.
+
+
+## Enable Terraform CLI logs
+
+Terraform CLI output can be written to the container logs to assist with debugging and to view detailed information about Terraform operations.
+To enable it, the `Workspace` spec has an **optional** `EnableTerraformCLILogging` field.
+```yaml
+apiVersion: tf.upbound.io/v1beta1
+kind: Workspace
+metadata:
+  name: example-random-generator
+  annotations:
+    meta.upbound.io/example-id: tf/v1beta1/workspace
+    crossplane.io/external-name: random
+spec:
+  forProvider:
+    source: Inline
+    enableTerraformCLILogging: true
+...
+```
+
+- `enableTerraformCLILogging`: Specifies whether logging is enabled (`true`) or disabled (`false`). When enabled, Terraform CLI command output will be written to the container logs. Default is `false`
diff --git a/docs/monolith/Quickstart.md b/docs/monolith/Quickstart.md
@@ -28,7 +28,7 @@ mv up /usr/local/bin/
 Verify the version of `up` with `up --version`
 
 ```shell
-$ up --version
+$ up version
 v0.13.0
 ```
 

diff --git a/examples/workspace-enable-logging.yaml b/examples/workspace-enable-logging.yaml
@@ -0,0 +1,34 @@
+apiVersion: tf.upbound.io/v1beta1
+kind: Workspace
+metadata:
+  name: example-random-generator
+  annotations:
+    meta.upbound.io/example-id: tf/v1beta1/workspace
+    # The terraform workspace will be named 'random'. If you omit this
+    # annotation it would be derived from metadata.name - e.g. 'example-random-generator.
+    crossplane.io/external-name: random
+spec:
+  forProvider:
+    enableTerraformCLILogging: true
+    source: Inline
+    module: |
+      resource "random_id" "example_id" {
+        byte_length = 8
+      }
+      resource "random_password" "password" {
+        length = 16
+        special = true
+      }
+      // Non-sensitive Outputs are written to status.atProvider.outputs and to the connection secret.
+      output "random_id_hex" {
+        value       = random_id.example_id.hex
+      }
+      // Sensitive Outputs are only written to the connection secret
+      output "random_password" {
+        value = random_password.password
+        sensitive = true
+      }
+      // Terraform has several other random resources, see the random provider for details
+  writeConnectionSecretToRef:
+    namespace: default
+    name: terraform-workspace-example-random-generator
diff --git a/go.mod b/go.mod
@@ -1,14 +1,14 @@
 module github.com/upbound/provider-terraform
 
-go 1.21
+go 1.22
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0
-	github.com/crossplane/crossplane-runtime v1.15.1
+	github.com/crossplane/crossplane-runtime v1.16.0
 	github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.4.0
-	github.com/hashicorp/go-getter v1.7.4
+	github.com/hashicorp/go-getter v1.7.5
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/afero v1.11.0
 	go.uber.org/zap v1.26.0
@@ -34,6 +34,7 @@ require (
 	github.com/aws/aws-sdk-go v1.44.122 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dave/jennifer v1.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

diff --git a/go.sum b/go.sum
@@ -203,6 +203,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -224,8 +226,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/crossplane/crossplane-runtime v1.15.1 h1:g1h75tNYOQT152IUNxs8ZgSsRFQKrZN9z69KefMujXs=
-github.com/crossplane/crossplane-runtime v1.15.1/go.mod h1:kRcJjJQmBFrR2n/KhwL8wYS7xNfq3D8eK4JliEScOHI=
+github.com/crossplane/crossplane-runtime v1.16.0 h1:lz+l0wEB3qowdTmN7t0PZkfuNSvfOoEhQrEYFbYqMow=
+github.com/crossplane/crossplane-runtime v1.16.0/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc=
 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y=
 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0=
 github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw=
@@ -384,8 +386,8 @@ github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=
-github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
+github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=
+github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
 github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
+0 −11		CODEOWNERS
+19 −16		README.md
+0 −91		common.sh
+0 −102		cross/Dockerfile
+0 −36		cross/Makefile
+0 −51		cross/rsyncd.sh
+0 −34		cross/run.sh
+0 −29		cross/xvfb-chrome
+15 −7		makelib/controlplane.mk
+0 −74		makelib/docs.mk
+19 −149		makelib/golang.mk
+0 −301		makelib/image.mk
+51 −22		makelib/k8s_tools.mk
+0 −185		makelib/local.mk
+7 −3		makelib/local.xpkg.mk
+0 −94		makelib/nodejs.mk
+5 −0		makelib/output.mk
+1 −0		makelib/xpkg.mk
+0 −76		makelib/yarnjs.mk
+0 −30		reset
+0 −175		run
+0 −46		scripts/load-configs.sh
+0 −165		scripts/localdev-deploy-component.sh
+0 −135		scripts/localdev-prepare.sh
+0 −36		scripts/localdev-remove-component.sh
+0 −87		scripts/localdev-scaffold.sh
+0 −61		scripts/utils.sh