fix(provider/big_query_source): include type field in service account key object value

Author: cysp

docs/resources/big_query_source.md

@@ -68,6 +68,7 @@ Required:
 - `private_key` (String, Sensitive)
 - `private_key_id` (String)
 - `project_id` (String)
+- `type` (String)
 
 
 

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/hashicorp/terraform-plugin-framework v1.15.1
 	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
 	github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0
+	github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
 	github.com/hashicorp/terraform-plugin-go v0.28.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-testing v1.13.3

go.sum

@@ -121,6 +121,8 @@ github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0 h1:SJXL5FfJJm17
 github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0/go.mod h1:p0phD0IYhsu9bR4+6OetVvvH59I6LwjXGnTVEr8ox6E=
 github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0 h1:v3DapR8gsp3EM8fKMh6up9cJUFQ2iRaFsYLP8UJnCco=
 github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0/go.mod h1:c3PnGE9pHBDfdEVG9t1S1C9ia5LW+gkFR0CygXlM8ak=
+github.com/hashicorp/terraform-plugin-framework-validators v0.18.0 h1:OQnlOt98ua//rCw+QhBbSqfW3QbwtVrcdWeQN5gI3Hw=
+github.com/hashicorp/terraform-plugin-framework-validators v0.18.0/go.mod h1:lZvZvagw5hsJwuY7mAY6KUz45/U6fiDR0CzQAwWD0CA=
 github.com/hashicorp/terraform-plugin-go v0.28.0 h1:zJmu2UDwhVN0J+J20RE5huiF3XXlTYVIleaevHZgKPA=
 github.com/hashicorp/terraform-plugin-go v0.28.0/go.mod h1:FDa2Bb3uumkTGSkTFpWSOwWJDwA7bf3vdP3ltLDTH6o=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=

internal/provider/big_query_source_model.go

@@ -23,6 +23,7 @@ type BigQuerySourceCredentials struct {
 }
 
 type BigQuerySourceCredentialsServiceAccountKey struct {
+	Type         types.String `tfsdk:"type"`
 	ProjectID    types.String `tfsdk:"project_id"`
 	PrivateKeyID types.String `tfsdk:"private_key_id"`
 	PrivateKey   types.String `tfsdk:"private_key"`

internal/provider/big_query_source_model_request.go

@@ -74,6 +74,10 @@ func (c BigQuerySourceCredentials) Encode(enc *jx.Encoder) {
 
 func (c BigQuerySourceCredentialsServiceAccountKey) Encode(enc *jx.Encoder) {
 	enc.Obj(func(enc *jx.Encoder) {
+		enc.Field("type", func(e *jx.Encoder) {
+			e.Str(c.Type.ValueString())
+		})
+
 		enc.Field("project_id", func(e *jx.Encoder) {
 			e.Str(c.ProjectID.ValueString())
 		})

internal/provider/big_query_source_resource.go

@@ -67,6 +67,7 @@ func (r *bigQuerySourceResource) MoveState(ctx context.Context) []resource.State
 					}
 
 					type sourceCredentialsServiceAccountKeyModel struct {
+						Type         *string `json:"type"`
 						ProjectID    *string `json:"project_id"`
 						PrivateKeyID *string `json:"private_key_id"`
 						PrivateKey   *string `json:"private_key"`
@@ -90,6 +91,7 @@ func (r *bigQuerySourceResource) MoveState(ctx context.Context) []resource.State
 
 					if sourceCredentials.ServiceAccountKey != nil {
 						serviceAccountKey := NewTypedObject(BigQuerySourceCredentialsServiceAccountKey{
+							Type:         types.StringPointerValue(sourceCredentials.ServiceAccountKey.Type),
 							ProjectID:    types.StringPointerValue(sourceCredentials.ServiceAccountKey.ProjectID),
 							PrivateKeyID: types.StringPointerValue(sourceCredentials.ServiceAccountKey.PrivateKeyID),
 							PrivateKey:   types.StringPointerValue(sourceCredentials.ServiceAccountKey.PrivateKey),

internal/provider/big_query_source_resource_schema.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"maps"
 
+	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource/identityschema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 )
 
 func BigQuerySourceResourceIdentitySchema(_ context.Context) identityschema.Schema {
@@ -58,6 +60,12 @@ func BigQuerySourceCredentialsResourceSchemaAttributes(ctx context.Context) map[
 
 func BigQuerySourceCredentialsServiceAccountKeyResourceSchemaAttributes(_ context.Context) map[string]schema.Attribute {
 	return map[string]schema.Attribute{
+		"type": schema.StringAttribute{
+			Required: true,
+			Validators: []validator.String{
+				stringvalidator.OneOf("service_account"),
+			},
+		},
 		"project_id": schema.StringAttribute{
 			Required: true,
 		},

internal/provider/big_query_source_resource_test.go

@@ -129,6 +129,7 @@ func TestAccBigQuerySourceResourceCreateUpdateDelete(t *testing.T) {
 						"project_id": config.StringVariable("project-id"),
 						"location":   config.StringVariable("US"),
 						"service_account_key": config.ObjectVariable(map[string]config.Variable{
+							"type":           config.StringVariable("service_account"),
 							"project_id":     config.StringVariable("project-id"),
 							"private_key_id": config.StringVariable("private-key-id"),
 							"private_key":    config.StringVariable("private-key"),
@@ -216,6 +217,7 @@ func TestAccBigQuerySourceResourceMovedFromSourceWithServiceAccountKey(t *testin
 			"project_id": config.StringVariable("project-id"),
 			"location":   config.StringVariable("US"),
 			"service_account_key": config.ObjectVariable(map[string]config.Variable{
+				"type":           config.StringVariable("service_account"),
 				"project_id":     config.StringVariable("project-id"),
 				"private_key_id": config.StringVariable("private-key-id"),
 				"private_key":    config.StringVariable("private-key"),