updated runtimes and services tf to work with stacks

kaleido-io · Nov 19, 2024 · 5165393 · 5165393
1 parent 0e094f3
commit 5165393
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/kaleido/platform/runtime.go b/kaleido/platform/runtime.go
@@ -33,6 +33,7 @@ type RuntimeResourceModel struct {
 	Environment         types.String `tfsdk:"environment"`
 	Type                types.String `tfsdk:"type"`
 	Name                types.String `tfsdk:"name"`
+	StackID             types.String `tfsdk:"stack_id"`
 	ConfigJSON          types.String `tfsdk:"config_json"`
 	LogLevel            types.String `tfsdk:"log_level"`
 	Size                types.String `tfsdk:"size"`
@@ -50,6 +51,7 @@ type RuntimeAPIModel struct {
 	Updated             *time.Time             `json:"updated,omitempty"`
 	Type                string                 `json:"type"`
 	Name                string                 `json:"name"`
+	StackID             string                 `json:"stackId"`
 	Config              map[string]interface{} `json:"config"`
 	LogLevel            string                 `json:"loglevel,omitempty"`
 	Size                string                 `json:"size,omitempty"`
@@ -89,6 +91,9 @@ func (r *runtimeResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 			"name": &schema.StringAttribute{
 				Required: true,
 			},
+			"stack_id": &schema.StringAttribute{
+				Required: true,
+			},
 			"environment": &schema.StringAttribute{
 				Required:      true,
 				PlanModifiers: []planmodifier.String{stringplanmodifier.RequiresReplace()},
@@ -134,6 +139,7 @@ func (data *RuntimeResourceModel) toAPI(api *RuntimeAPIModel) {
 	// required fields
 	api.Type = data.Type.ValueString()
 	api.Name = data.Name.ValueString()
+	api.StackID = data.StackID.ValueString()
 	// optional fields
 	api.Config = map[string]interface{}{}
 	if !data.ConfigJSON.IsNull() {

diff --git a/kaleido/platform/runtime_test.go b/kaleido/platform/runtime_test.go
@@ -33,6 +33,7 @@ resource "kaleido_platform_runtime" "runtime1" {
     environment = "env1"
     type = "besu"
     name = "runtime1"
+	stack_id = "stack1"
     config_json = jsonencode({
         "setting1": "value1"
     })
@@ -47,6 +48,7 @@ resource "kaleido_platform_runtime" "runtime1" {
     environment = "env1"
     type = "besu"
     name = "runtime1"
+	stack_id = "stack1"
     config_json = jsonencode({
         "setting1": "value1",
         "setting2": "value2",
@@ -65,6 +67,7 @@ resource "kaleido_platform_runtime" "runtime1" {
     environment = "env1"
     type = "besu"
     name = "runtime1"
+	stack_id = "stack1"
     config_json = jsonencode({
         "setting1": "value1",
         "setting2": "value2",
@@ -109,6 +112,7 @@ func TestRuntime1(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(runtime1Resource, "id"),
 					resource.TestCheckResourceAttr(runtime1Resource, "name", `runtime1`),
+					resource.TestCheckResourceAttr(runtime1Resource, "stack_id", `stack1`),
 					resource.TestCheckResourceAttr(runtime1Resource, "type", `besu`),
 					resource.TestCheckResourceAttr(runtime1Resource, "config_json", `{"setting1":"value1"}`),
 					resource.TestCheckResourceAttr(runtime1Resource, "log_level", `info`),
@@ -124,6 +128,7 @@ func TestRuntime1(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(runtime1Resource, "id"),
 					resource.TestCheckResourceAttr(runtime1Resource, "name", `runtime1`),
+					resource.TestCheckResourceAttr(runtime1Resource, "stack_id", `stack1`),
 					resource.TestCheckResourceAttr(runtime1Resource, "type", `besu`),
 					resource.TestCheckResourceAttr(runtime1Resource, "config_json", `{"setting1":"value1","setting2":"value2"}`),
 					resource.TestCheckResourceAttr(runtime1Resource, "log_level", `trace`),
@@ -145,6 +150,7 @@ func TestRuntime1(t *testing.T) {
 							"updated": "%[3]s",
 							"type": "besu",
 							"name": "runtime1",
+							"stackId": "stack1",
 							"config": {
 								"setting1": "value1",
 								"setting2": "value2"
@@ -174,6 +180,7 @@ func TestRuntime1(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(runtime1Resource, "id"),
 					resource.TestCheckResourceAttr(runtime1Resource, "name", `runtime1`),
+					resource.TestCheckResourceAttr(runtime1Resource, "stack_id", `stack1`),
 					resource.TestCheckResourceAttr(runtime1Resource, "type", `besu`),
 					resource.TestCheckResourceAttr(runtime1Resource, "config_json", `{"setting1":"value1","setting2":"value2"}`),
 					resource.TestCheckResourceAttr(runtime1Resource, "log_level", `trace`),
@@ -195,6 +202,7 @@ func TestRuntime1(t *testing.T) {
 							"updated": "%[3]s",
 							"type": "besu",
 							"name": "runtime1",
+							"stackId": "stack1",
 							"config": {
 								"setting1": "value1",
 								"setting2": "value2"

diff --git a/kaleido/platform/service.go b/kaleido/platform/service.go
@@ -33,12 +33,11 @@ import (
 type ServiceResourceModel struct {
 	ID                  types.String `tfsdk:"id"`
 	Environment         types.String `tfsdk:"environment"`
-	Stack               types.String `tfsdk:"stack"`
 	Runtime             types.String `tfsdk:"runtime"`
 	Type                types.String `tfsdk:"type"`
 	Name                types.String `tfsdk:"name"`
-	EnvironmentMemberID types.String `tfsdk:"environment_member_id"`
 	StackID             types.String `tfsdk:"stack_id"`
+	EnvironmentMemberID types.String `tfsdk:"environment_member_id"`
 	ConfigJSON          types.String `tfsdk:"config_json"`
 	Endpoints           types.Map    `tfsdk:"endpoints"`
 	Hostnames           types.Map    `tfsdk:"hostnames"`
@@ -53,10 +52,10 @@ type ServiceAPIModel struct {
 	Updated             *time.Time                    `json:"updated,omitempty"`
 	Type                string                        `json:"type"`
 	Name                string                        `json:"name"`
+	StackID             string                        `json:"stackId"`
 	Runtime             ServiceAPIRuntimeRef          `json:"runtime,omitempty"`
 	Account             string                        `json:"account,omitempty"`
 	EnvironmentMemberID string                        `json:"environmentMemberId,omitempty"`
-	StackId             string                        `json:"stackId,omitempty"`
 	Deleted             bool                          `json:"deleted,omitempty"`
 	Config              map[string]interface{}        `json:"config"`
 	Endpoints           map[string]ServiceAPIEndpoint `json:"endpoints,omitempty"`
@@ -115,10 +114,6 @@ func (r *serviceResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 				Required:      true,
 				PlanModifiers: []planmodifier.String{stringplanmodifier.RequiresReplace()},
 			},
-			"stack": &schema.StringAttribute{
-				Required:      true,
-				PlanModifiers: []planmodifier.String{stringplanmodifier.RequiresReplace()},
-			},
 			"runtime": &schema.StringAttribute{
 				Required:      true,
 				PlanModifiers: []planmodifier.String{stringplanmodifier.RequiresReplace()},
@@ -130,10 +125,10 @@ func (r *serviceResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 			"name": &schema.StringAttribute{
 				Required: true,
 			},
-			"environment_member_id": &schema.StringAttribute{
-				Computed: true,
-			},
 			"stack_id": &schema.StringAttribute{
+				Required: true,
+			},
+			"environment_member_id": &schema.StringAttribute{
 				Computed: true,
 			},
 			"config_json": &schema.StringAttribute{
@@ -233,6 +228,7 @@ func (data *ServiceResourceModel) toAPI(ctx context.Context, api *ServiceAPIMode
 	// required fields
 	api.Type = data.Type.ValueString()
 	api.Name = data.Name.ValueString()
+	api.StackID = data.StackID.ValueString()
 	api.Runtime.ID = data.Runtime.ValueString()
 	api.Config = map[string]interface{}{}
 	if !data.ConfigJSON.IsNull() {
@@ -347,7 +343,6 @@ func (data *ServiceResourceModel) toAPI(ctx context.Context, api *ServiceAPIMode
 func (api *ServiceAPIModel) toData(data *ServiceResourceModel, diagnostics *diag.Diagnostics) {
 	data.ID = types.StringValue(api.ID)
 	data.EnvironmentMemberID = types.StringValue(api.EnvironmentMemberID)
-	data.StackID = types.StringValue(api.StackId)
 	endpoints := map[string]attr.Value{}
 	endpointAttrTypes := map[string]attr.Type{
 		"type": types.StringType,

diff --git a/kaleido/platform/service_test.go b/kaleido/platform/service_test.go
@@ -32,10 +32,10 @@ import (
 var serviceStep1 = `
 resource "kaleido_platform_service" "service1" {
     environment = "env1"
-	stack = "stack1"
 	runtime = "runtime1"
     type = "besu"
     name = "service1"
+	stack_id = "stack1"
     config_json = jsonencode({
         "setting1": "value1"
     })
@@ -45,10 +45,10 @@ resource "kaleido_platform_service" "service1" {
 var serviceStep2 = `
 resource "kaleido_platform_service" "service1" {
     environment = "env1"
-	stack = "stack1"
 	runtime = "runtime1"
     type = "besu"
     name = "service1"
+	stack_id = "stack1"
     config_json = jsonencode({
         "setting1": "value1",
         "setting2": "value2",
@@ -125,6 +125,7 @@ func TestService1(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(service1Resource, "id"),
 					resource.TestCheckResourceAttr(service1Resource, "name", `service1`),
+					resource.TestCheckResourceAttr(service1Resource, "stack_id", `stack1`),
 					resource.TestCheckResourceAttr(service1Resource, "type", `besu`),
 					resource.TestCheckResourceAttr(service1Resource, "config_json", `{"setting1":"value1"}`),
 					resource.TestCheckResourceAttr(service1Resource, "endpoints.%", `1`),
@@ -138,6 +139,7 @@ func TestService1(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(service1Resource, "id"),
 					resource.TestCheckResourceAttr(service1Resource, "name", `service1`),
+					resource.TestCheckResourceAttr(service1Resource, "stack_id", `stack1`),
 					resource.TestCheckResourceAttr(service1Resource, "type", `besu`),
 					resource.TestCheckResourceAttr(service1Resource, "config_json", `{"setting1":"value1","setting2":"value2"}`),
 					func(s *terraform.State) error {
@@ -151,11 +153,11 @@ func TestService1(t *testing.T) {
 							"updated": "%[3]s",
 							"type": "besu",
 							"name": "service1",
+							"stackId": "stack1",
 							"runtime": {
 								"id": "runtime1"
 							},
 							"environmentMemberId": "%[4]s",
-							"stackId": "%[5]s",
 							"status": "ready",
 							"config": {
 								"setting1": "value1",
@@ -230,7 +232,6 @@ func TestService1(t *testing.T) {
 							svc.Created.UTC().Format(time.RFC3339Nano),
 							svc.Updated.UTC().Format(time.RFC3339Nano),
 							svc.EnvironmentMemberID,
-							svc.StackId,
 						))
 						return nil
 					},
@@ -272,7 +273,6 @@ func (mp *mockPlatform) postService(res http.ResponseWriter, req *http.Request)
 	svc.Created = &now
 	svc.Updated = &now
 	svc.EnvironmentMemberID = nanoid.New()
-	svc.StackId = nanoid.New()
 	svc.Status = "pending"
 	svc.Endpoints = map[string]ServiceAPIEndpoint{
 		"api": {