speakeasy autogen (#79)

opalsecurity · Aug 5, 2024 · dca3c44 · dca3c44
1 parent 723e045
commit dca3c44
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 27 deletions.
diff --git a/.speakeasy/gen.lock b/.speakeasy/gen.lock
@@ -3,10 +3,10 @@ id: b5c8bf75-06e1-47c8-b9ae-ce49ba56069d
 management:
   docChecksum: a107ffd47833df714c17fbb8f44eb9c0
   docVersion: "1.0"
-  speakeasyVersion: 1.352.0
-  generationVersion: 2.384.4
-  releaseVersion: 0.23.7
-  configChecksum: f6814dfdacb389e0eddca61bb7c19067
+  speakeasyVersion: 1.352.2
+  generationVersion: 2.385.2
+  releaseVersion: 0.24.0
+  configChecksum: e434993130d9af19734fdb89d4ace9dc
   repoURL: https://github.com/opalsecurity/terraform-provider-opal.git
   repoSubDirectory: .
   published: true
@@ -17,7 +17,8 @@ features:
     constsAndDefaults: 0.1.4
     core: 3.24.6
     deprecations: 2.81.1
-    globalSecurity: 2.81.6
+    envVarSecurityUsage: 0.1.0
+    globalSecurity: 2.81.8
     globalServerURLs: 2.82.1
     ignores: 2.81.1
     nameOverrides: 2.81.2

diff --git a/.speakeasy/workflow.lock b/.speakeasy/workflow.lock
@@ -1,16 +1,16 @@
-speakeasyVersion: 1.352.0
+speakeasyVersion: 1.352.2
 sources:
     opal-terraform-provider:
         sourceNamespace: opal-terraform-provider
-        sourceRevisionDigest: sha256:5de9ff927b6e35695aff3f63995be2b1bac285ace66b939fdc5944fa30de7b43
+        sourceRevisionDigest: sha256:5a5431e90e6bfc1d8b390535469fce11d87690d718a91c0329e65500874d6de5
         sourceBlobDigest: sha256:86b9ddd85104869419ff2b39c734475e8343b5faea5af83f20ccc4a5c482876c
         tags:
             - latest
 targets:
     terraform:
         source: opal-terraform-provider
         sourceNamespace: opal-terraform-provider
-        sourceRevisionDigest: sha256:5de9ff927b6e35695aff3f63995be2b1bac285ace66b939fdc5944fa30de7b43
+        sourceRevisionDigest: sha256:5a5431e90e6bfc1d8b390535469fce11d87690d718a91c0329e65500874d6de5
         sourceBlobDigest: sha256:86b9ddd85104869419ff2b39c734475e8343b5faea5af83f20ccc4a5c482876c
         outLocation: .
 workflow:

diff --git a/docs/index.md b/docs/index.md
@@ -17,7 +17,7 @@ terraform {
   required_providers {
     opal = {
       source  = "opalsecurity/opal"
-      version = "0.23.7"
+      version = "0.24.0"
     }
   }
 }
@@ -30,10 +30,7 @@ provider "opal" {
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Required
-
-- `bearer_auth` (String, Sensitive)
-
 ### Optional
 
+- `bearer_auth` (String, Sensitive)
 - `server_url` (String) Server URL (defaults to https://api.opal.dev/v1)
diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     opal = {
       source  = "opalsecurity/opal"
-      version = "0.23.7"
+      version = "0.24.0"
     }
   }
 }

diff --git a/gen.yaml b/gen.yaml
@@ -11,7 +11,7 @@ generation:
     oAuth2ClientCredentialsEnabled: false
   flattenGlobalSecurity: true
 terraform:
-  version: 0.23.7
+  version: 0.24.0
   additionalDataSources: []
   additionalDependencies: {}
   additionalResources: []

diff --git a/internal/provider/group_resource_test.go b/internal/provider/group_resource_test.go
@@ -387,7 +387,7 @@ func testAccCheckGroupDestroy(s *terraform.State) error {
 		}
 
 		security := shared.Security{
-			BearerAuth: opalToken,
+			BearerAuth: &opalToken,
 		}
 		opts := []sdk.SDKOption{
 			sdk.WithServerURL(opalBaseURL),

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -46,7 +46,7 @@ func (p *OpalProvider) Schema(ctx context.Context, req provider.SchemaRequest, r
 			},
 			"bearer_auth": schema.StringAttribute{
 				Sensitive: true,
-				Required:  true,
+				Optional:  true,
 			},
 		},
 	}
@@ -67,13 +67,16 @@ func (p *OpalProvider) Configure(ctx context.Context, req provider.ConfigureRequ
 		ServerURL = "https://api.opal.dev/v1"
 	}
 
-	var bearerAuth string
-	if len(os.Getenv("OPAL_AUTH_TOKEN")) > 0 {
-		bearerAuth = os.Getenv("OPAL_AUTH_TOKEN")
+	bearerAuth := new(string)
+	if !data.BearerAuth.IsUnknown() && !data.BearerAuth.IsNull() {
+		*bearerAuth = data.BearerAuth.ValueString()
 	} else {
-		bearerAuth = data.BearerAuth.ValueString()
+		if len(os.Getenv("OPAL_AUTH_TOKEN")) > 0 {
+			*bearerAuth = os.Getenv("OPAL_AUTH_TOKEN")
+		} else {
+			bearerAuth = nil
+		}
 	}
-
 	security := shared.Security{
 		BearerAuth: bearerAuth,
 	}

diff --git a/internal/sdk/models/shared/security.go b/internal/sdk/models/shared/security.go
@@ -3,12 +3,12 @@
 package shared
 
 type Security struct {
-	BearerAuth string `security:"scheme,type=http,subtype=bearer,name=Authorization"`
+	BearerAuth *string `security:"scheme,type=http,subtype=bearer,name=Authorization"`
 }
 
-func (o *Security) GetBearerAuth() string {
+func (o *Security) GetBearerAuth() *string {
 	if o == nil {
-		return ""
+		return nil
 	}
 	return o.BearerAuth
 }
diff --git a/internal/sdk/opalapi.go b/internal/sdk/opalapi.go
@@ -181,8 +181,8 @@ func New(opts ...SDKOption) *OpalAPI {
 			Language:          "go",
 			OpenAPIDocVersion: "1.0",
 			SDKVersion:        "0.0.1",
-			GenVersion:        "2.384.4",
-			UserAgent:         "speakeasy-sdk/go 0.0.1 2.384.4 1.0 github.com/opalsecurity/terraform-provider-opal/internal/sdk",
+			GenVersion:        "2.385.2",
+			UserAgent:         "speakeasy-sdk/go 0.0.1 2.385.2 1.0 github.com/opalsecurity/terraform-provider-opal/internal/sdk",
 			Hooks:             hooks.New(),
 		},
 	}