Merge pull request #4 from indentapis/66DA64F8B991686137E7F2FF04654B1C

sync(provider): pull from indent core

Author: tschuy

README.md

@@ -1,8 +1,9 @@
 ### terraform-provider-indent
 
-Auth is currently handled with the `indent` cli. To log in:
+Auth can be handled either with a Google Service Account JSON file, or with the `indent` cli.
 
-`$ indent auth login --space my-space-name`
+To use the `indent` cli:
+$ indent auth login --space my-space-name
 
 To verify you have authenticated successfully, you can check `auth view`:
 
@@ -27,6 +28,7 @@ Once you've successfully authenticated, you can initialize the provider:
 ```terraform
 provider "indent" {
   space = "my-space-name"
+  // json_key_file = "/path/to/file.json"
 }
 ```
 

docs/data-sources/webhook.md

@@ -3,10 +3,13 @@
 page_title: "indent_webhook Data Source - indent"
 subcategory: ""
 description: |-
+  
 ---
 
 # indent_webhook (Data Source)
 
+
+
 ## Example Usage
 
 ```terraform
@@ -16,7 +19,6 @@ data "indent_webhook" "provider_indent_webhook" {
 ```
 
 <!-- schema generated by tfplugindocs -->
-
 ## Schema
 
 ### Optional
@@ -32,16 +34,15 @@ data "indent_webhook" "provider_indent_webhook" {
 - `url` (String) URL of deployed Webhook; requested when a permission is granted or revoked
 
 <a id="nestedblock--handler"></a>
-
 ### Nested Schema for `handler`
 
 Optional:
 
 - `resource_kinds` (List of String) Resource kinds webhook supports
 - `type` (String) Type of webhook (pullUpdate/applyUpdate/decision)
 
-<a id="nestedblock--header"></a>
 
+<a id="nestedblock--header"></a>
 ### Nested Schema for `header`
 
 Required:
@@ -52,3 +53,5 @@ Optional:
 
 - `credential` (String) Name of Credential to use as header value (instead of string value)
 - `value` (String) String to use as header value (instead of Credential)
+
+

docs/index.md

@@ -15,7 +15,9 @@ description: |-
 ```terraform
 /**
 
-Auth is currently handled with the `indent` cli.
+Auth can be handled either with a Google Service Account JSON file, or with the `indent` cli.
+
+To use the `indent` cli:
 $ indent auth login --space my-space-name
 
 To verify you have authenticated successfully, you can check `auth view`:
@@ -32,11 +34,20 @@ $ indent auth view --space my-space-name 2>&1 | jq
     ...
   }
 }
+
+To use a Service Account JSON file, simply reference it in the provider config.
 **/
 
 provider "indent" {
+  // use cli auth
   space = "my-space-name"
 }
+
+provider "indent" {
+  // use static service account auth
+  space         = "my-space-name"
+  json_key_file = "/config/service-account-281938728bdd.json"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -45,3 +56,8 @@ provider "indent" {
 ### Required
 
 - `space` (String) The Indent space name to work in
+
+### Optional
+
+- `json_key_file` (String) Path to Google Developers service account JSON key file
+- `staging` (Boolean) Use Indent staging environment

docs/resources/webhook.md

@@ -3,10 +3,13 @@
 page_title: "indent_webhook Resource - indent"
 subcategory: ""
 description: |-
+  
 ---
 
 # indent_webhook (Resource)
 
+
+
 ## Example Usage
 
 ```terraform
@@ -31,14 +34,19 @@ resource "indent_webhook" "integration-okta-webhook" {
   }
 }
 
-output "new_webhook_id" {
-  description = "block ID of our new webhook"
-  value       = indent_webhook.new_webhook.id
+output "okta_webhook_id" {
+  description = "block ID of the new webhook"
+  value       = indent_webhook.integration-okta-webhook.id
+}
+
+output "okta_webhook_secret" {
+  description = "signing secret of the new webhook"
+  value       = indent_webhook.integration-okta-webhook.secret
+  sensitive   = true
 }
 ```
 
 <!-- schema generated by tfplugindocs -->
-
 ## Schema
 
 ### Required
@@ -60,16 +68,15 @@ output "new_webhook_id" {
 - `space_name` (String) Name of the Space the webhook is in
 
 <a id="nestedblock--handler"></a>
-
 ### Nested Schema for `handler`
 
 Optional:
 
 - `resource_kinds` (List of String) Resource kinds webhook supports
 - `type` (String) Type of webhook (pullUpdate/applyUpdate/decision)
 
-<a id="nestedblock--header"></a>
 
+<a id="nestedblock--header"></a>
 ### Nested Schema for `header`
 
 Required:
@@ -80,3 +87,5 @@ Optional:
 
 - `credential` (String) Name of Credential to use as header value (instead of string value)
 - `value` (String) String to use as header value (instead of Credential)
+
+

examples/provider/provider.tf

@@ -1,6 +1,8 @@
 /**
 
-Auth is currently handled with the `indent` cli.
+Auth can be handled either with a Google Service Account JSON file, or with the `indent` cli.
+
+To use the `indent` cli:
 $ indent auth login --space my-space-name
 
 To verify you have authenticated successfully, you can check `auth view`:
@@ -17,8 +19,17 @@ $ indent auth view --space my-space-name 2>&1 | jq
     ...
   }
 }
+
+To use a Service Account JSON file, simply reference it in the provider config.
 **/
 
 provider "indent" {
+  // use cli auth
   space = "my-space-name"
 }
+
+provider "indent" {
+  // use static service account auth
+  space         = "my-space-name"
+  json_key_file = "/config/service-account-281938728bdd.json"
+}

go.mod

@@ -2,10 +2,7 @@ module go.indent.com/terraform-provider-indent
 
 go 1.18
 
-require (
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
-	go.indent.com/indent-go v0.0.9-0.20230119081731-51229bc93f9b
-)
+require github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 
 require (
 	cloud.google.com/go v0.34.0 // indirect
@@ -42,19 +39,20 @@ require (
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/zclconf/go-cty v1.12.1 // indirect
+	go.indent.com/indent-go v0.0.9-0.20230130182250-ded99026d98d // indirect
 	go.uber.org/atomic v1.5.0 // indirect
 	go.uber.org/multierr v1.3.0 // indirect
 	go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
 	go.uber.org/zap v1.14.0 // indirect
 	golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/mod v0.6.0 // indirect
 	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
 	golang.org/x/sys v0.3.0 // indirect
 	golang.org/x/text v0.5.0 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.2.0 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
-	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
+	google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154 // indirect
 	google.golang.org/grpc v1.50.1 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	honnef.co/go/tools v0.0.1-2019.2.3 // indirect