Merge pull request #1074 from hashicorp/main

Main to Release 0.7.1

.github/dependabot.yml

@@ -8,7 +8,4 @@ updates:
     schedule:
       interval: "daily"
       time: "05:00"
-      timezone: "UTC"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+      timezone: "UTC"

.github/workflows/build.yml

@@ -71,15 +71,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - {go: "1.18", goos: "linux", goarch: "386"}
-          - {go: "1.18", goos: "linux", goarch: "amd64"}
-          - {go: "1.18", goos: "linux", goarch: "arm"}
-          - {go: "1.18", goos: "linux", goarch: "arm64"}
-          - {go: "1.18", goos: "freebsd", goarch: "386"}
-          - {go: "1.18", goos: "freebsd", goarch: "amd64"}
-          - {go: "1.18", goos: "windows", goarch: "386"}
-          - {go: "1.18", goos: "windows", goarch: "amd64"}
-          - {go: "1.18", goos: "solaris", goarch: "amd64"}
+          - {go: "1.20.10", goos: "linux", goarch: "386"}
+          - {go: "1.20.10", goos: "linux", goarch: "amd64"}
+          - {go: "1.20.10", goos: "linux", goarch: "arm"}
+          - {go: "1.20.10", goos: "linux", goarch: "arm64"}
+          - {go: "1.20.10", goos: "freebsd", goarch: "386"}
+          - {go: "1.20.10", goos: "freebsd", goarch: "amd64"}
+          - {go: "1.20.10", goos: "windows", goarch: "386"}
+          - {go: "1.20.10", goos: "windows", goarch: "amd64"}
+          - {go: "1.20.10", goos: "solaris", goarch: "amd64"}
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -147,7 +147,7 @@ jobs:
       matrix:
         goos: [darwin]
         goarch: ["amd64"]
-        go: ["1.18"]
+        go: ["1.20.10"]
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.20.10
   CONSUL_VERSION: 1.12.1
   TERRAFORM_VERSION: 1.2.2
 

.github/workflows/weekly-tests.yml

@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.20.10
   CONSUL_VERSION: 1.12.1
   TERRAFORM_VERSION: 1.2.2
   VAULT_VERSION: 1.10.3

CHANGELOG.md

@@ -3,6 +3,10 @@
 BUG FIXES:
 * Fix issue with re registration of services with checks not triggering task [[GH-1067](https://github.com/hashicorp/consul-terraform-sync/pull/1067)]
 
+FEATURES:
+* Go version bump to 1.21.10 [[GH-1067](https://github.com/hashicorp/consul-terraform-sync/pull/1067)]
+* Support for Terraform v1.6.2 [[GH-1067](https://github.com/hashicorp/consul-terraform-sync/pull/1067)]
+
 ## 0.7.0 (September 8, 2022)
 
 BREAKING CHANGES:

config/monitor_services.go

@@ -131,10 +131,10 @@ func (c *ServicesMonitorConfig) Merge(o MonitorConfig) MonitorConfig {
 // Finalize ensures there no nil pointers.
 //
 // Exception: `Regexp` is never finalized and can potentially be nil.
-//  - There is a need to distinguish betweeen nil regex (unconfigured regex) and
-//  empty string regex ("" regex pattern) at Validate().
-//  - Setting `Regexp` as an empty string is not idempotent. There is a need to
-//  call Finalize() and Validate() multiple times.
+//   - There is a need to distinguish betweeen nil regex (unconfigured regex) and
+//     empty string regex ("" regex pattern) at Validate().
+//   - Setting `Regexp` as an empty string is not idempotent. There is a need to
+//     call Finalize() and Validate() multiple times.
 func (c *ServicesMonitorConfig) Finalize() {
 	if c == nil { // config not required, return early
 		return

config/task.go

@@ -465,9 +465,10 @@ func (c *TaskConfig) Validate() error {
 
 // ValidateForDriver validates all remaining values and required options that were not checked during
 // the normal Validate() call. This method is recommended to run after:
-//  - Finalize()
-//  - Validate()
-//  - InheritParentConfig()
+//   - Finalize()
+//   - Validate()
+//   - InheritParentConfig()
+//
 // It is intended to indicate whether a task is safe to be converted into a driver for execution.
 func (c *TaskConfig) ValidateForDriver() error {
 	if err := c.BufferPeriod.Validate(); err != nil {
@@ -643,9 +644,10 @@ func FilterTasks(tasks *TaskConfigs, names []string) (*TaskConfigs, error) {
 }
 
 // validateCondition validates condition block taking into account services list
-// - ensure task is configured with a condition (condition block or services
-//   list)
-// - if services list is configured, condition block's monitored variable type
+//   - ensure task is configured with a condition (condition block or services
+//     list)
+//   - if services list is configured, condition block's monitored variable type
+//
 // cannot be services
 //
 // Note: checking that a condition block's monitored variable type is different

e2e/condition_schedule_test.go

@@ -44,7 +44,7 @@ const (
 	condition "schedule" {
 		cron = "*/10 * * * * * *"
 	}
-	module_input "services"{
+	module_input "services" {
 		regexp = "^web.*|^api.*"
 	}
 }`
@@ -69,8 +69,8 @@ func TestCondition_Schedule_Basic(t *testing.T) {
 	condition "schedule" {
 		cron = "*/10 * * * * * *"
 	}
-}
-`, taskName)
+	}
+	`, taskName)
 	moduleInputServices := fmt.Sprintf(scheduledServices, taskName)
 	moduleInputConsulKV := fmt.Sprintf(scheduledConsulKV, taskName)
 
@@ -157,6 +157,7 @@ func TestCondition_Schedule_Basic(t *testing.T) {
 			// check scheduled task did not trigger immediately and ran only on schedule
 			api.WaitForEvent(t, cts, taskName, registerTime, scheduledWait)
 			checkScheduledRun(t, taskName, registerTime, taskSchedule, port)
+			time.Sleep(defaultWaitForTestReadiness)
 
 			// confirm service resources created
 			resourcesPath := filepath.Join(tempDir, taskName, resourcesDir)
@@ -348,6 +349,8 @@ func TestCondition_Schedule_CreateAndDeleteCLI(t *testing.T) {
 	api.WaitForEvent(t, cts, taskName, registerTime, scheduledWait)
 	checkScheduledRun(t, taskName, registerTime, taskSchedule, port)
 
+	time.Sleep(defaultWaitForTestReadiness)
+
 	// confirm resources created
 	resourcesPath := filepath.Join(tempDir, taskName, resourcesDir)
 	validateServices(t, true, []string{"api-1", "web-1"}, resourcesPath)

e2e/condition_service_test.go

@@ -188,7 +188,7 @@ func testServicesCondition(t *testing.T, tc servicesConditionTest) {
 	now := time.Now()
 	service = testutil.TestService{ID: "api-web-1", Name: "api-web"}
 	testutils.RegisterConsulService(t, srv, service, defaultWaitForRegistration)
-	api.WaitForEvent(t, cts, tc.taskName, now, defaultWaitForEvent)
+	api.WaitForEvent(t, cts, tc.taskName, now, defaultWaitForTestReadiness)
 	eventCountNow = eventCount(t, tc.taskName, cts.Port())
 	eventCountExpected++
 	require.Equal(t, eventCountExpected, eventCountNow,
@@ -201,7 +201,7 @@ func testServicesCondition(t *testing.T, tc servicesConditionTest) {
 	now = time.Now()
 	service = testutil.TestService{ID: "api-web-2", Name: "api-web"}
 	testutils.RegisterConsulService(t, srv, service, defaultWaitForRegistration)
-	api.WaitForEvent(t, cts, tc.taskName, now, defaultWaitForEvent)
+	api.WaitForEvent(t, cts, tc.taskName, now, defaultWaitForTestReadiness)
 	eventCountNow = eventCount(t, tc.taskName, cts.Port())
 	eventCountExpected++
 	require.Equal(t, eventCountExpected, eventCountNow,
@@ -212,7 +212,7 @@ func testServicesCondition(t *testing.T, tc servicesConditionTest) {
 	now = time.Now()
 	service = testutil.TestService{ID: "api-web-3", Name: "api-web", Tags: []string{"tag_a"}}
 	testutils.RegisterConsulService(t, srv, service, defaultWaitForRegistration)
-	time.Sleep(defaultWaitForNoEvent)
+	time.Sleep(defaultWaitForTestReadiness)
 	eventCountNow = eventCount(t, tc.taskName, cts.Port())
 	require.Equal(t, eventCountExpected, eventCountNow,
 		"change in event count. task was unexpectedly triggered")
@@ -340,7 +340,7 @@ func TestConditionServices_SuppressTriggers_SharedDependencies(t *testing.T) {
 	now := time.Now()
 	service := testutil.TestService{ID: "api-test", Name: "api-test"}
 	testutils.RegisterConsulService(t, srv, service, defaultWaitForRegistration)
-	api.WaitForEvent(t, cts, taskName, now, defaultWaitForEvent)
+	api.WaitForEvent(t, cts, taskName, now, defaultWaitForTestReadiness)
 	count = eventCount(t, taskName, cts.Port())
 	expectedCount++
 	assert.Equal(t, expectedCount, count, "unexpected event count")
@@ -351,7 +351,7 @@ func TestConditionServices_SuppressTriggers_SharedDependencies(t *testing.T) {
 	now = time.Now()
 	service = testutil.TestService{ID: "web", Name: "web"}
 	testutils.RegisterConsulService(t, srv, service, defaultWaitForRegistration)
-	api.WaitForEvent(t, cts, initTaskName, now, defaultWaitForEvent)
+	api.WaitForEvent(t, cts, initTaskName, now, defaultWaitForTestReadiness)
 	initCount := eventCount(t, initTaskName, cts.Port())
 	assert.Equal(t, 2, initCount, "unexpected event count")
 	initResources := filepath.Join(tempDir, initTaskName, resourcesDir)

e2e/module_input_test.go

@@ -223,7 +223,7 @@ func testModuleInputBasic(t *testing.T, tc moduleInputTest) {
 	tc.srv.SetKVString(t, "key", "value")
 	tc.srv.SetKVString(t, "key/recurse", "value-recurse")
 
-	time.Sleep(defaultWaitForNoEvent)
+	time.Sleep(defaultWaitForTestReadiness)
 	testutils.CheckDir(t, false, resourcesPath)
 
 	// 2. Register "web" service to trigger condition. Confirm that
@@ -394,7 +394,7 @@ func TestModuleInput_ConsulKVCondition(t *testing.T) {
 			service := testutil.TestService{ID: "api", Name: "api"}
 			testutils.RegisterConsulService(t, srv, service, defaultWaitForRegistration)
 
-			time.Sleep(defaultWaitForNoEvent)
+			time.Sleep(defaultWaitForTestReadiness)
 			testutils.CheckDir(t, false, resourcesPath)
 
 			// 2. Register kv pair to trigger condition. Confirm that

examples/reference-example/sync-tasks/my-task/main.tf

@@ -12,7 +12,7 @@
 # Description: automate services for website X
 
 terraform {
-  required_version = ">= 0.13.0, < 1.3.0"
+  required_version = ">= 0.13.0, <= 1.6.2"
   required_providers {
     myprovider = {
       source  = "namespace/myprovider"

go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul-terraform-sync
 
-go 1.18
+go 1.20
 
 require (
 	github.com/PaloAltoNetworks/pango v0.5.1

internal/decode/decode.go

@@ -25,7 +25,8 @@ import (
 // Aliases must be lowercase, as keys are compared case-insensitive.
 //
 // Example alias tag:
-//    MyField []string `alias:"old_field_name,otherfieldname"`
+//
+//	MyField []string `alias:"old_field_name,otherfieldname"`
 //
 // This hook should ONLY be used to maintain backwards compatibility with
 // deprecated keys. For new structures use mapstructure struct tags to set the
@@ -149,7 +150,7 @@ type mapstructureFieldTags struct {
 // the target is a slice. This is necessary because this hook would have converted
 // the initial slices into single values on the first pass.
 //
-// Background
+// # Background
 //
 // HCL allows for repeated blocks which forces it to store structures
 // as []map[string]interface{} instead of map[string]interface{}. This is an