Data source for packer registry

internal/clients/hvn_route.go

@@ -120,7 +120,7 @@ func hvnRouteRefreshState(ctx context.Context, client *Client, hvnID, routeID st
 			return nil, "", err
 		}
 
-		return route, string(route.State), nil
+		return route, string(*route.State), nil
 	}
 }
 

internal/clients/operation.go

@@ -55,8 +55,8 @@ func WaitForOperation(ctx context.Context, client *Client, operationName string,
 				// Reset consecutive errors after a successful response.
 				consecutiveErrors = 0
 
-				log.Printf("[INFO] Received state of %s operation (%s): %s", operationName, operationID, waitResponse.Payload.Operation.State)
-				if waitResponse.Payload.Operation.State == sharedmodels.HashicorpCloudOperationOperationStateDONE {
+				log.Printf("[INFO] Received state of %s operation (%s): %s", operationName, operationID, *waitResponse.Payload.Operation.State)
+				if *waitResponse.Payload.Operation.State == sharedmodels.HashicorpCloudOperationOperationStateDONE {
 					if waitResponse.Payload.Operation.Error != nil {
 						err := fmt.Errorf("%s operation (%s) failed [code=%d, message=%s]",
 							operationName, waitResponse.Payload.Operation.ID, waitResponse.Payload.Operation.Error.Code, waitResponse.Payload.Operation.Error.Message)

internal/clients/peering.go

@@ -44,7 +44,7 @@ func peeringRefreshState(ctx context.Context, client *Client, peeringID string,
 			return nil, "", err
 		}
 
-		return peering, string(peering.State), nil
+		return peering, string(*peering.State), nil
 	}
 }
 

internal/consul/version.go

@@ -14,7 +14,7 @@ func RecommendedVersion(versions []*consulmodels.HashicorpCloudConsul20210204Ver
 	for _, v := range versions {
 		defaultVersion = v.Version
 
-		if v.Status == "RECOMMENDED" {
+		if v.Status != nil && *v.Status == consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED {
 			return defaultVersion
 		}
 	}
@@ -44,7 +44,7 @@ func VersionsToString(versions []*consulmodels.HashicorpCloudConsul20210204Versi
 			continue
 		}
 
-		if v.Status == consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED {
+		if v.Status != nil && *v.Status == consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED {
 			recommendedVersion = v.Version
 		} else {
 			otherVersions = append(otherVersions, v.Version)

internal/consul/version_test.go

@@ -7,6 +7,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func statusPTR(s consulmodels.HashicorpCloudConsul20210204VersionStatus) *consulmodels.HashicorpCloudConsul20210204VersionStatus {
+	return &s
+}
+
 func Test_RecommendedVersion(t *testing.T) {
 	tcs := map[string]struct {
 		expected string
@@ -16,15 +20,15 @@ func Test_RecommendedVersion(t *testing.T) {
 			input: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.9.0",
-					Status:  "RECOMMENDED",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED),
 				},
 				{
 					Version: "v1.8.6",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.4",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 			},
 			expected: "v1.9.0",
@@ -33,15 +37,15 @@ func Test_RecommendedVersion(t *testing.T) {
 			input: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.9.0",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.6",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.4",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 			},
 			expected: "v1.8.4",
@@ -69,15 +73,15 @@ func Test_IsValidVersion(t *testing.T) {
 			validVersions: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.9.0",
-					Status:  "RECOMMENDED",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED),
 				},
 				{
 					Version: "v1.8.6",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.4",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 			},
 			expected: true,
@@ -87,15 +91,15 @@ func Test_IsValidVersion(t *testing.T) {
 			validVersions: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.9.0",
-					Status:  "RECOMMENDED",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED),
 				},
 				{
 					Version: "v1.8.6",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.4",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 			},
 			expected: false,
@@ -126,15 +130,15 @@ func Test_VersionsToString(t *testing.T) {
 			input: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.9.0",
-					Status:  "RECOMMENDED",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED),
 				},
 				{
 					Version: "v1.8.6",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.4",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 			},
 			expected: "v1.9.0 (recommended), v1.8.6, v1.8.4",
@@ -143,11 +147,11 @@ func Test_VersionsToString(t *testing.T) {
 			input: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.8.6",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 				{
 					Version: "v1.8.4",
-					Status:  "AVAILABLE",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusAVAILABLE),
 				},
 			},
 			expected: "v1.8.6, v1.8.4",
@@ -156,7 +160,7 @@ func Test_VersionsToString(t *testing.T) {
 			input: []*consulmodels.HashicorpCloudConsul20210204Version{
 				{
 					Version: "v1.9.0",
-					Status:  "RECOMMENDED",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED),
 				},
 			},
 			expected: "v1.9.0",
@@ -170,7 +174,7 @@ func Test_VersionsToString(t *testing.T) {
 				nil,
 				{
 					Version: "v1.9.0",
-					Status:  "RECOMMENDED",
+					Status:  statusPTR(consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED),
 				},
 				nil,
 			},

internal/provider/data_source_consul_versions.go

@@ -66,7 +66,7 @@ func dataSourceConsulVersionsRead(ctx context.Context, d *schema.ResourceData, m
 	previewVersions := make([]string, 0)
 
 	for _, v := range availableConsulVersions {
-		switch v.Status {
+		switch *v.Status {
 		case consulmodels.HashicorpCloudConsul20210204VersionStatusRECOMMENDED:
 			recommendedVersion = v.Version
 			availableVersions = append(availableVersions, v.Version)

internal/provider/resource_aws_network_peering.go

@@ -235,7 +235,7 @@ func resourceAwsNetworkPeeringRead(ctx context.Context, d *schema.ResourceData,
 
 	// The network peering failed to provision properly so we want to let the user know and
 	// remove it from state
-	if peering.State == networkmodels.HashicorpCloudNetwork20200907PeeringStateFAILED {
+	if *peering.State == networkmodels.HashicorpCloudNetwork20200907PeeringStateFAILED {
 		log.Printf("[WARN] Network peering (%s) failed to provision, removing from state", peering.ID)
 		d.SetId("")
 		return nil

internal/provider/resource_consul_cluster.go

@@ -311,6 +311,8 @@ func resourceConsulClusterCreate(ctx context.Context, d *schema.ResourceData, me
 
 	connectEnabled := d.Get("connect_enabled").(bool)
 	publicEndpoint := d.Get("public_endpoint").(bool)
+	tier := consulmodels.HashicorpCloudConsul20210204ClusterConfigTier(strings.ToUpper(d.Get("tier").(string)))
+	size := consulmodels.HashicorpCloudConsul20210204CapacityConfigSize(strings.ToUpper(d.Get("size").(string)))
 
 	// Enabling auto peering will peer this cluster's HVN with every other HVN with members in this federation.
 	// The peering happens within the secondary cluster create operation.
@@ -320,9 +322,9 @@ func resourceConsulClusterCreate(ctx context.Context, d *schema.ResourceData, me
 
 	consulCuster := &consulmodels.HashicorpCloudConsul20210204Cluster{
 		Config: &consulmodels.HashicorpCloudConsul20210204ClusterConfig{
-			Tier: consulmodels.HashicorpCloudConsul20210204ClusterConfigTier(strings.ToUpper(d.Get("tier").(string))),
+			Tier: &tier,
 			CapacityConfig: &consulmodels.HashicorpCloudConsul20210204CapacityConfig{
-				Size: consulmodels.HashicorpCloudConsul20210204CapacityConfigSize(strings.ToUpper(d.Get("size").(string))),
+				Size: &size,
 			},
 			ConsulConfig: &consulmodels.HashicorpCloudConsul20210204ConsulConfig{
 				ConnectEnabled: connectEnabled,
@@ -539,7 +541,7 @@ func resourceConsulClusterRead(ctx context.Context, d *schema.ResourceData, meta
 
 	// The Consul cluster failed to provision properly so we want to let the user know and
 	// remove it from state
-	if cluster.State == consulmodels.HashicorpCloudConsul20210204ClusterStateFAILED {
+	if *cluster.State == consulmodels.HashicorpCloudConsul20210204ClusterStateFAILED {
 		log.Printf("[WARN] Consul cluster (%s) failed to provision, removing from state", clusterID)
 		d.SetId("")
 		return nil

internal/provider/resource_consul_snapshot.go

@@ -169,7 +169,7 @@ func resourceConsulSnapshotRead(ctx context.Context, d *schema.ResourceData, met
 
 	// The Consul snapshot failed to provision properly so we want to let the user know and
 	// remove it from state
-	if snapshotResp.Snapshot.State == consulmodels.HashicorpCloudConsul20210204SnapshotSnapshotStateCREATINGFAILED {
+	if *snapshotResp.Snapshot.State == consulmodels.HashicorpCloudConsul20210204SnapshotSnapshotStateCREATINGFAILED {
 		log.Printf("[WARN] Consul snapshot (%s) failed to provision, removing from state", snapshotResp.Snapshot.ID)
 		d.SetId("")
 		return nil

internal/provider/resource_hvn.go

@@ -204,7 +204,7 @@ func resourceHvnRead(ctx context.Context, d *schema.ResourceData, meta interface
 
 	// The HVN failed to provision properly so we want to let the user know and remove it from
 	// state
-	if hvn.State == networkmodels.HashicorpCloudNetwork20200907NetworkStateFAILED {
+	if *hvn.State == networkmodels.HashicorpCloudNetwork20200907NetworkStateFAILED {
 		log.Printf("[WARN] HVN (%s) failed to provision, removing from state", hvnID)
 		d.SetId("")
 		return nil

internal/provider/resource_hvn_route.go

@@ -191,7 +191,7 @@ func resourceHvnRouteRead(ctx context.Context, d *schema.ResourceData, meta inte
 	}
 
 	// The HVN route failed to provision properly so we want to let the user know and remove it from state.
-	if route.State == networkmodels.HashicorpCloudNetwork20200907HVNRouteStateFAILED {
+	if *route.State == networkmodels.HashicorpCloudNetwork20200907HVNRouteStateFAILED {
 		log.Printf("[WARN] HVN route (%s) failed to provision, removing from state", idLink.ID)
 		d.SetId("")
 		return nil

internal/provider/resource_vault_cluster.go

@@ -176,6 +176,7 @@ func resourceVaultClusterCreate(ctx context.Context, d *schema.ResourceData, met
 	}
 
 	publicEndpoint := d.Get("public_endpoint").(bool)
+	tier := vaultmodels.HashicorpCloudVault20201125Tier(strings.ToUpper(d.Get("tier").(string)))
 
 	log.Printf("[INFO] Creating Vault cluster (%s)", clusterID)
 
@@ -184,7 +185,7 @@ func resourceVaultClusterCreate(ctx context.Context, d *schema.ResourceData, met
 			VaultConfig: &vaultmodels.HashicorpCloudVault20201125VaultConfig{
 				InitialVersion: vaultVersion,
 			},
-			Tier: vaultmodels.HashicorpCloudVault20201125Tier(strings.ToUpper(d.Get("tier").(string))),
+			Tier: &tier,
 			NetworkConfig: &vaultmodels.HashicorpCloudVault20201125InputNetworkConfig{
 				NetworkID:        hvn.ID,
 				PublicIpsEnabled: publicEndpoint,
@@ -253,7 +254,7 @@ func resourceVaultClusterRead(ctx context.Context, d *schema.ResourceData, meta
 
 	// The Vault cluster failed to provision properly so we want to let the user know and
 	// remove it from state.
-	if cluster.State == vaultmodels.HashicorpCloudVault20201125ClusterStateFAILED {
+	if *cluster.State == vaultmodels.HashicorpCloudVault20201125ClusterStateFAILED {
 		log.Printf("[WARN] Vault cluster (%s) failed to provision, removing from state", clusterID)
 		d.SetId("")
 		return nil