Merge pull request #44 from platacard/bugfix/vistibility-state-value

bugfix: archival state value
platacard · May 7, 2024 · 0a3a614 · 0a3a614
2 parents 52e0d8f + d77400c
commit 0a3a614
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/internal/provider/common.go b/internal/provider/common.go
@@ -0,0 +1,13 @@
+package provider
+
+import (
+	"go.temporal.io/api/enums/v1"
+)
+
+var (
+	ArchivalState = map[string]enums.ArchivalState{
+		"Unspecified": enums.ARCHIVAL_STATE_UNSPECIFIED,
+		"Disabled":    enums.ARCHIVAL_STATE_DISABLED,
+		"Enabled":     enums.ARCHIVAL_STATE_ENABLED,
+	}
+)
diff --git a/internal/provider/namespace_data_source.go b/internal/provider/namespace_data_source.go
@@ -9,7 +9,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	"go.temporal.io/api/enums/v1"
 	"go.temporal.io/api/workflowservice/v1"
 	"google.golang.org/grpc"
 )
@@ -158,9 +157,9 @@ func (d *NamespaceDataSource) Read(ctx context.Context, req datasource.ReadReque
 		OwnerEmail:              types.StringValue(ns.NamespaceInfo.GetOwnerEmail()),
 		Retention:               types.Int64Value(int64(ns.Config.WorkflowExecutionRetentionTtl.AsDuration().Hours() / 24)),
 		ActiveClusterName:       types.StringValue(ns.GetReplicationConfig().GetActiveClusterName()),
-		HistoryArchivalState:    types.StringValue(enums.ArchivalState_name[int32(ns.Config.GetHistoryArchivalState())]),
+		HistoryArchivalState:    types.StringValue(ns.Config.GetHistoryArchivalState().String()),
 		HistoryArchivalUri:      types.StringValue(ns.Config.GetHistoryArchivalUri()),
-		VisibilityArchivalState: types.StringValue(enums.ArchivalState_name[int32(ns.Config.GetVisibilityArchivalState())]),
+		VisibilityArchivalState: types.StringValue(ns.Config.GetVisibilityArchivalState().String()),
 		VisibilityArchivalUri:   types.StringValue(ns.Config.GetVisibilityArchivalUri()),
 		IsGlobalNamespace:       types.BoolValue(ns.GetIsGlobalNamespace()),
 	}

diff --git a/internal/provider/namespace_resource.go b/internal/provider/namespace_resource.go
@@ -3,9 +3,10 @@ package provider
 import (
 	"context"
 	"fmt"
-	"google.golang.org/protobuf/types/known/durationpb"
 	"time"
 
+	"google.golang.org/protobuf/types/known/durationpb"
+
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -185,9 +186,9 @@ func (r *NamespaceResource) Create(ctx context.Context, req resource.CreateReque
 		OwnerEmail:                       data.OwnerEmail.ValueString(),
 		WorkflowExecutionRetentionPeriod: retention,
 		ActiveClusterName:                data.ActiveClusterName.ValueString(),
-		VisibilityArchivalState:          enums.ArchivalState(enums.ArchivalState_value[data.VisibilityArchivalState.ValueString()]),
+		VisibilityArchivalState:          ArchivalState[data.VisibilityArchivalState.ValueString()],
 		VisibilityArchivalUri:            data.VisibilityArchivalUri.ValueString(),
-		HistoryArchivalState:             enums.ArchivalState(enums.ArchivalState_value[data.HistoryArchivalState.ValueString()]),
+		HistoryArchivalState:             ArchivalState[data.HistoryArchivalState.ValueString()],
 		HistoryArchivalUri:               data.HistoryArchivalUri.ValueString(),
 		IsGlobalNamespace:                data.IsGlobalNamespace.ValueBool(),
 	}
@@ -252,9 +253,9 @@ func (r *NamespaceResource) Read(ctx context.Context, req resource.ReadRequest,
 		OwnerEmail:              types.StringValue(ns.NamespaceInfo.GetOwnerEmail()),
 		Retention:               types.Int64Value(int64(ns.Config.WorkflowExecutionRetentionTtl.AsDuration().Hours() / 24)),
 		ActiveClusterName:       types.StringValue(ns.GetReplicationConfig().GetActiveClusterName()),
-		HistoryArchivalState:    types.StringValue(enums.ArchivalState_name[int32(ns.Config.GetHistoryArchivalState())]),
+		HistoryArchivalState:    types.StringValue(ns.Config.GetHistoryArchivalState().String()),
 		HistoryArchivalUri:      types.StringValue(ns.Config.GetHistoryArchivalUri()),
-		VisibilityArchivalState: types.StringValue(enums.ArchivalState_name[int32(ns.Config.GetVisibilityArchivalState())]),
+		VisibilityArchivalState: types.StringValue(ns.Config.GetVisibilityArchivalState().String()),
 		VisibilityArchivalUri:   types.StringValue(ns.Config.GetVisibilityArchivalUri()),
 		IsGlobalNamespace:       types.BoolValue(ns.GetIsGlobalNamespace()),
 	}
@@ -288,9 +289,9 @@ func (r *NamespaceResource) Update(ctx context.Context, req resource.UpdateReque
 		},
 		Config: &namespace.NamespaceConfig{
 			WorkflowExecutionRetentionTtl: retention,
-			VisibilityArchivalState:       enums.ArchivalState(enums.ArchivalState_value[data.VisibilityArchivalState.ValueString()]),
+			VisibilityArchivalState:       ArchivalState[data.VisibilityArchivalState.ValueString()],
 			VisibilityArchivalUri:         data.VisibilityArchivalUri.ValueString(),
-			HistoryArchivalState:          enums.ArchivalState(enums.ArchivalState_value[data.HistoryArchivalState.ValueString()]),
+			HistoryArchivalState:          ArchivalState[data.HistoryArchivalState.ValueString()],
 			HistoryArchivalUri:            data.HistoryArchivalUri.ValueString(),
 		},
 		ReplicationConfig: &replication.NamespaceReplicationConfig{