Update to 0.6.9 (#105)

MaterializeInc · Mar 29, 2024 · 3f03719 · 3f03719
1 parent d9a2589
commit 3f03719
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+## 0.1.9 - 2024-03-29
+Update to Terraform Provider [0.6.9](https://github.com/MaterializeInc/terraform-provider-materialize/releases/tag/v0.6.9).
+
 ## 0.1.8 - 2024-03-14
 Update to Terraform Provider [0.6.8](https://github.com/MaterializeInc/terraform-provider-materialize/releases/tag/v0.6.8).
 

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
@@ -9,7 +9,8 @@ services:
     command:
       - '--cluster-replica-sizes={"3xsmall": {"workers": 1, "scale": 1, "credits_per_hour": "1"}, "2xsmall": {"workers": 1, "scale": 1, "credits_per_hour": "1"}}'
       - --bootstrap-default-cluster-replica-size=3xsmall
-      - --bootstrap-builtin-cluster-replica-size=3xsmall
+      - --bootstrap-builtin-system-cluster-replica-size=3xsmall
+      - --bootstrap-builtin-introspection-cluster-replica-size=3xsmall
       - --availability-zone=test1
       - --availability-zone=test2
       - --all-features
@@ -29,4 +30,4 @@ services:
     container_name: cloud
     build: mocks/cloud
     ports:
-      - "3001:3001"
+      - "3001:3001"
diff --git a/examples/mocks/frontegg/mock_server.go b/examples/mocks/frontegg/mock_server.go
@@ -595,13 +595,29 @@ func listSSOConfigs(w http.ResponseWriter, r *http.Request) {
 	mutex.Lock()
 	configs := make([]SSOConfig, 0, len(ssoConfigs))
 	for _, config := range ssoConfigs {
+		// Ensure that Domains and Groups are not nil
+		if config.Domains == nil {
+			config.Domains = []Domain{}
+		}
+		if config.Groups == nil {
+			config.Groups = []GroupMapping{}
+		}
+		// Initialize RoleIds if it's nil
+		if config.RoleIds == nil {
+			config.RoleIds = []string{}
+		}
 		configs = append(configs, config)
 	}
 	mutex.Unlock()
 
-	responseBytes, _ := json.Marshal(configs)
-	fmt.Printf("Response body: %s\n", string(responseBytes))
+	responseBytes, err := json.Marshal(configs)
+	if err != nil {
+		fmt.Printf("Error marshaling response: %v\n", err)
+		sendResponse(w, http.StatusInternalServerError, "Internal server error")
+		return
+	}
 
+	fmt.Printf("Response body: %s\n", string(responseBytes))
 	sendResponse(w, http.StatusOK, configs)
 }
 

diff --git a/provider/cmd/pulumi-resource-materialize/schema.json b/provider/cmd/pulumi-resource-materialize/schema.json
diff --git a/provider/go.mod b/provider/go.mod
@@ -5,7 +5,7 @@ go 1.20
 replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e
 
 require (
-	github.com/MaterializeInc/terraform-provider-materialize v0.6.8
+	github.com/MaterializeInc/terraform-provider-materialize v0.6.9
 	github.com/pulumi/pulumi-terraform-bridge/v3 v3.59.0
 	github.com/pulumi/pulumi/sdk/v3 v3.81.0
 )

diff --git a/provider/go.sum b/provider/go.sum
@@ -715,8 +715,8 @@ github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYr
 github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
 github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
-github.com/MaterializeInc/terraform-provider-materialize v0.6.8 h1:peU7Cfym8Dw7zft+LQL81y7CurwfqNpOdp/yW0ghu00=
-github.com/MaterializeInc/terraform-provider-materialize v0.6.8/go.mod h1:OiKVThIYxLU5nQFzABdOEJOaQ7Q9wZAOnsJX4UTRSq0=
+github.com/MaterializeInc/terraform-provider-materialize v0.6.9 h1:+1uVe+NiRZs8flDcj0fAWYHCk3GrzagickjFn3cOSV0=
+github.com/MaterializeInc/terraform-provider-materialize v0.6.9/go.mod h1:OiKVThIYxLU5nQFzABdOEJOaQ7Q9wZAOnsJX4UTRSq0=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=

diff --git a/provider/resources.go b/provider/resources.go
@@ -111,6 +111,7 @@ func Provider() tfbridge.ProviderInfo {
 			"materialize_materialized_view_grant":              {Tok: tfbridge.MakeResource(mainPkg, mainMod, "GrantMaterializedView")},
 			"materialize_role":                                 {Tok: tfbridge.MakeResource(mainPkg, mainMod, "Role")},
 			"materialize_role_grant":                           {Tok: tfbridge.MakeResource(mainPkg, mainMod, "GrantRole")},
+			"materialize_role_parameter":                       {Tok: tfbridge.MakeResource(mainPkg, mainMod, "RoleParameter")},
 			"materialize_schema":                               {Tok: tfbridge.MakeResource(mainPkg, mainMod, "Schema")},
 			"materialize_schema_grant":                         {Tok: tfbridge.MakeResource(mainPkg, mainMod, "GrantSchema")},
 			"materialize_schema_grant_default_privilege":       {Tok: tfbridge.MakeResource(mainPkg, mainMod, "GrantSchemaDefaultPrivilege")},