Converted resource okta_log_stream implementation from Terraform SDK v2

to Terraform Plugin Framework Protocol 5.
okta · Dec 7, 2023 · 0ea729b · 0ea729b
1 parent b3f8831
commit 0ea729b
Show file tree

Hide file tree

Showing 8 changed files with 534 additions and 32 deletions.
diff --git a/examples/resources/okta_log_stream/basic.tf b/examples/resources/okta_log_stream/basic.tf
@@ -1,4 +1,4 @@
-resource "okta_log_stream" "eventbridge_log_stream_example" {
+resource "okta_log_stream" "eventbridge" {
   name     = "testAcc_replace_with_uuid EventBridge"
   type     = "aws_eventbridge"
   status   = "ACTIVE"
@@ -9,13 +9,13 @@ resource "okta_log_stream" "eventbridge_log_stream_example" {
   }
 }
 
-resource "okta_log_stream" "splunk_log_stream_example" {
+resource "okta_log_stream" "splunk" {
   name              = "testAcc_replace_with_uuid Splunk"
   type              = "splunk_cloud_logstreaming"
-  status            = "ACTIVE"
+  status            = "INACTIVE"
   settings {
     host = "acme.splunkcloud.com"
     edition = "aws"
     token = "58A7C8D6-4E2F-4C3B-8F5B-D4E2F3A4B5C6"
   }
-}
+}
diff --git a/examples/resources/okta_log_stream/basic_updated.tf b/examples/resources/okta_log_stream/basic_updated.tf
@@ -1,15 +1,15 @@
-resource "okta_log_stream" "eventbridge_log_stream_example" {
+resource "okta_log_stream" "eventbridge" {
   name     = "testAcc_replace_with_uuid EventBridge Updated"
   type     = "aws_eventbridge"
-  status   = "ACTIVE"
+  status   = "INACTIVE"
   settings {
     account_id = "123456789012"
     region     = "eu-west-3"
     event_source_name = "testAcc_replace_with_uuid"
   }
 }
 
-resource "okta_log_stream" "splunk_log_stream_example" {
+resource "okta_log_stream" "splunk" {
   name              = "testAcc_replace_with_uuid Splunk Updated"
   type              = "splunk_cloud_logstreaming"
   status            = "ACTIVE"
@@ -18,4 +18,4 @@ resource "okta_log_stream" "splunk_log_stream_example" {
     edition = "aws"
     token = "58A7C8D6-4E2F-4C3B-8F5B-D4E2F3A4B5C6"
   }
-}
+}
diff --git a/okta/data_source_okta_log_stream.go b/okta/data_source_okta_log_stream.go
@@ -78,7 +78,7 @@ func dataSourceLogStreamRead(ctx context.Context, d *schema.ResourceData, m inte
 
 	settings := make(map[string]interface{})
 	// aws
-	assignIfNotEmpty(&settings, "account_id", logStream.Settings.AccountId)
+	assignIfNotEmpty(&settings, "account_id", logStream.Settings.AccountID)
 	assignIfNotEmpty(&settings, "event_source_name", logStream.Settings.EventSourceName)
 	assignIfNotEmpty(&settings, "region", logStream.Settings.Region)
 

diff --git a/okta/data_source_okta_log_stream_test.go b/okta/data_source_okta_log_stream_test.go
@@ -14,9 +14,9 @@ func TestAccDataSourceOktaLogStream_read(t *testing.T) {
 	splunkDataSource := fmt.Sprintf("data.%s.test_by_name", logStream)
 
 	oktaResourceTest(t, resource.TestCase{
-		PreCheck:          testAccPreCheck(t),
-		ErrorCheck:        testAccErrorChecks(t),
-		ProviderFactories: testAccProvidersFactories,
+		PreCheck:                 testAccPreCheck(t),
+		ErrorCheck:               testAccErrorChecks(t),
+		ProtoV5ProviderFactories: testAccMergeProvidersFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: config,

diff --git a/okta/framework_provider.go b/okta/framework_provider.go
@@ -256,6 +256,7 @@ func (p *FrameworkProvider) Resources(_ context.Context) []func() resource.Resou
 		NewAppAccessPolicyAssignmentResource,
 		NewAppOAuthRoleAssignmentResource,
 		NewBrandResource,
+		NewLogStreamResource,
 		NewPolicyDeviceAssuranceAndroidResource,
 		NewPolicyDeviceAssuranceChromeOSResource,
 		NewPolicyDeviceAssuranceIOSResource,

diff --git a/okta/provider.go b/okta/provider.go
@@ -297,7 +297,6 @@ func Provider() *schema.Provider {
 			inlineHook:                    resourceInlineHook(),
 			linkDefinition:                resourceLinkDefinition(),
 			linkValue:                     resourceLinkValue(),
-			logStream:                     resourceLogStream(),
 			networkZone:                   resourceNetworkZone(),
 			orgConfiguration:              resourceOrgConfiguration(),
 			orgSupport:                    resourceOrgSupport(),