Fixed #590

Specifying the environment variable `DYNATRACE_HTTP_OAUTH_PREFERENCE=true` allows for any resources that are eligible for using OAuth for authentication will utilize the necessary endpoints

Author: Reinhard-Pilz-Dynatrace

.github/workflows/tests.yml

@@ -122,19 +122,19 @@ func DataSource() *schema.Resource {
 var staticID = uuid.NewString()
 
 func DataSourceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	creds, err := config.Credentials(m, config.CredValAutomation)
+	creds, err := config.Credentials(m, config.CredValDefault)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	httplog.InstallRoundTripper()
 
 	clientsFactory := clients.Factory().
-		WithPlatformURL(creds.Automation.EnvironmentURL).
+		WithPlatformURL(creds.OAuth.EnvironmentURL).
 		WithOAuthCredentials(clientcredentials.Config{
-			ClientID:     creds.Automation.ClientID,
-			ClientSecret: creds.Automation.ClientSecret,
-			TokenURL:     creds.Automation.TokenURL,
+			ClientID:     creds.OAuth.ClientID,
+			ClientSecret: creds.OAuth.ClientSecret,
+			TokenURL:     creds.OAuth.TokenURL,
 		}).
 		WithUserAgent("Dynatrace Terraform Provider")
 

datasources/dql/data_source.go

@@ -22,6 +22,7 @@ import (
 	"os"
 
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
+	restlogging "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest/logging"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/provider/config"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/provider/logging"
@@ -46,9 +47,9 @@ func XResource() *schema.Resource {
 	}
 }
 
-func createCredentials(m any) *settings.Credentials {
+func createCredentials(m any) *rest.Credentials {
 	conf := m.(*config.ProviderConfiguration)
-	return &settings.Credentials{
+	return &rest.Credentials{
 		Token: conf.APIToken,
 		URL:   conf.EnvironmentURL,
 	}
@@ -97,7 +98,7 @@ func Read(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 		if restLogFile, err = os.Create(restLogFileName); err != nil {
 			return diag.FromErr(err)
 		}
-		rest.SetLogWriter(restLogFile)
+		restlogging.SetLogWriter(restLogFile)
 	}
 	settings := Settings()
 	if err := Service(m).Get(ctx, d.Id(), settings); err != nil {

datasources/v2alerting/resource.go

@@ -19,13 +19,14 @@ package connection
 
 import (
 	connection "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/azure/connector/microsoftentraidentitydeveloperconnection/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "0.1.1"
 const SchemaID = "app:dynatrace.azure.connector:microsoft-entra-identity-developer-connection"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*connection.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*connection.Settings] {
 	return settings20.Service[*connection.Settings](credentials, SchemaID, SchemaVersion)
 }

dynatrace/api/app/dynatrace/azure/connector/microsoftentraidentitydeveloperconnection/service.go

@@ -19,13 +19,14 @@ package database
 
 import (
 	database "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/database/featureflags/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "1"
 const SchemaID = "app:dynatrace.database.overview:feature-flags"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*database.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*database.Settings] {
 	return settings20.Service[*database.Settings](credentials, SchemaID, SchemaVersion)
 }

dynatrace/api/app/dynatrace/database/featureflags/service.go

@@ -19,13 +19,14 @@ package gitonprem
 
 import (
 	gitonprem "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/devobs/debugger/gitonprem/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "0.2"
 const SchemaID = "app:dynatrace.devobs.debugger:git.on.prem"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*gitonprem.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*gitonprem.Settings] {
 	return settings20.Service[*gitonprem.Settings](credentials, SchemaID, SchemaVersion)
 }

dynatrace/api/app/dynatrace/devobs/debugger/gitonprem/service.go

@@ -19,13 +19,14 @@ package defaultrules
 
 import (
 	defaultrules "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/discovery/coverage/defaultrules/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "1.0.7"
 const SchemaID = "app:dynatrace.discovery.coverage:discovery.findings.default.rules.schema"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*defaultrules.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*defaultrules.Settings] {
 	return settings20.Service[*defaultrules.Settings](credentials, SchemaID, SchemaVersion)
 }

dynatrace/api/app/dynatrace/discovery/coverage/defaultrules/service.go

@@ -19,13 +19,14 @@ package featureflags
 
 import (
 	featureflags "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/discovery/coverage/featureflags/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "1"
 const SchemaID = "app:dynatrace.discovery.coverage:feature-flags"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*featureflags.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*featureflags.Settings] {
 	return settings20.Service[*featureflags.Settings](credentials, SchemaID, SchemaVersion)
 }

dynatrace/api/app/dynatrace/discovery/coverage/featureflags/service.go

@@ -19,13 +19,14 @@ package connection
 
 import (
 	connection "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/github/connector/connection/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "0.1.1"
 const SchemaID = "app:dynatrace.github.connector:connection"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*connection.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*connection.Settings] {
 	return settings20.Service[*connection.Settings](credentials, SchemaID, SchemaVersion)
 }

dynatrace/api/app/dynatrace/github/connector/connection/service.go

@@ -19,13 +19,14 @@ package connection
 
 import (
 	connection "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/app/dynatrace/gitlab/connector/connection/settings"
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/rest"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
 const SchemaVersion = "0.1.2"
 const SchemaID = "app:dynatrace.gitlab.connector:connection"
 
-func Service(credentials *settings.Credentials) settings.CRUDService[*connection.Settings] {
+func Service(credentials *rest.Credentials) settings.CRUDService[*connection.Settings] {
 	return settings20.Service[*connection.Settings](credentials, SchemaID, SchemaVersion)
 }