chore: refactor import urls after repo move

stackit/internal/services/postgresflexalpha/instance/datasource.go

@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
-	postgresflexalpha2 "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/datasources_gen"
-	postgresflexUtils "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/utils"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
+	postgresflexalpha2 "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/datasources_gen"
+	postgresflexUtils "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/utils"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/core"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/utils"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils"
 )
 
 // Ensure the implementation satisfies the expected interfaces.

stackit/internal/services/postgresflexalpha/instance/functions.go

@@ -8,10 +8,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	postgresflex "github.com/mhenselin/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
-	postgresflexalphadatasource "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/datasources_gen"
-	postgresflexalpharesource "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/utils"
+	postgresflex "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
+	postgresflexalphadatasource "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/datasources_gen"
+	postgresflexalpharesource "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils"
 )
 
 func mapGetInstanceResponseToModel(ctx context.Context, m *postgresflexalpharesource.InstanceModel, resp *postgresflex.GetInstanceResponse) error {
@@ -48,8 +48,15 @@ func mapGetInstanceResponseToModel(ctx context.Context, m *postgresflexalphareso
 		)
 	}
 
-	m.ConnectionInfo.Host = types.StringValue(resp.ConnectionInfo.GetHost())
-	m.ConnectionInfo.Port = types.Int64Value(resp.ConnectionInfo.GetPort())
+	m.ConnectionInfo.Host = types.StringValue("")
+	if host, ok := resp.ConnectionInfo.GetHostOk(); ok {
+		m.ConnectionInfo.Host = types.StringValue(host)
+	}
+
+	m.ConnectionInfo.Port = types.Int64Value(0)
+	if port, ok := resp.ConnectionInfo.GetPortOk(); ok {
+		m.ConnectionInfo.Port = types.Int64Value(port)
+	}
 
 	m.FlavorId = types.StringValue(resp.GetFlavorId())
 	if m.Id.IsNull() || m.Id.IsUnknown() {
@@ -64,6 +71,8 @@ func mapGetInstanceResponseToModel(ctx context.Context, m *postgresflexalphareso
 		return fmt.Errorf("failed converting network acl from response")
 	}
 
+	m.Acl = netAcl
+
 	netInstAdd := types.StringValue("")
 	if instAdd, ok := resp.Network.GetInstanceAddressOk(); ok {
 		netInstAdd = types.StringValue(instAdd)
@@ -113,12 +122,7 @@ func mapGetInstanceResponseToModel(ctx context.Context, m *postgresflexalphareso
 
 func mapGetDataInstanceResponseToModel(ctx context.Context, m *postgresflexalphadatasource.InstanceModel, resp *postgresflex.GetInstanceResponse) error {
 	m.BackupSchedule = types.StringValue(resp.GetBackupSchedule())
-	m.Encryption = postgresflexalphadatasource.EncryptionValue{
-		KekKeyId:       types.StringValue(resp.Encryption.GetKekKeyId()),
-		KekKeyRingId:   types.StringValue(resp.Encryption.GetKekKeyRingId()),
-		KekKeyVersion:  types.StringValue(resp.Encryption.GetKekKeyVersion()),
-		ServiceAccount: types.StringValue(resp.Encryption.GetServiceAccount()),
-	}
+	handleEncryption(m, resp)
 	m.ConnectionInfo.Host = types.StringValue(resp.ConnectionInfo.GetHost())
 	m.ConnectionInfo.Port = types.Int64Value(resp.ConnectionInfo.GetPort())
 	m.FlavorId = types.StringValue(resp.GetFlavorId())
@@ -126,25 +130,12 @@ func mapGetDataInstanceResponseToModel(ctx context.Context, m *postgresflexalpha
 	m.InstanceId = types.StringPointerValue(resp.Id)
 	m.IsDeletable = types.BoolValue(resp.GetIsDeletable())
 	m.Name = types.StringValue(resp.GetName())
-	netAcl, diags := types.ListValueFrom(ctx, types.StringType, resp.Network.GetAcl())
-	if diags.HasError() {
-		return fmt.Errorf("failed converting network acl from response")
+
+	err := handleNetwork(ctx, m, resp)
+	if err != nil {
+		return err
 	}
 
-	net, diags := postgresflexalphadatasource.NewNetworkValue(
-		postgresflexalphadatasource.NetworkValue{}.AttributeTypes(ctx),
-		map[string]attr.Value{
-			"access_scope":     types.StringValue(string(resp.Network.GetAccessScope())),
-			"acl":              netAcl,
-			"instance_address": types.StringValue(resp.Network.GetInstanceAddress()),
-			"router_address":   types.StringValue(resp.Network.GetRouterAddress()),
-		},
-	)
-	if diags.HasError() {
-		return fmt.Errorf("failed converting network from response")
-	}
-
-	m.Network = net
 	m.Replicas = types.Int64Value(int64(resp.GetReplicas()))
 	m.RetentionDays = types.Int64Value(resp.GetRetentionDays())
 	m.Status = types.StringValue(string(resp.GetStatus()))
@@ -162,3 +153,64 @@ func mapGetDataInstanceResponseToModel(ctx context.Context, m *postgresflexalpha
 	m.Version = types.StringValue(resp.GetVersion())
 	return nil
 }
+
+func handleNetwork(ctx context.Context, m *postgresflexalphadatasource.InstanceModel, resp *postgresflex.GetInstanceResponse) error {
+	netAcl, diags := types.ListValueFrom(ctx, types.StringType, resp.Network.GetAcl())
+	if diags.HasError() {
+		return fmt.Errorf("failed converting network acl from response")
+	}
+
+	instAddr := ""
+	if iA, ok := resp.Network.GetInstanceAddressOk(); ok {
+		instAddr = iA
+	}
+
+	rtrAddr := ""
+	if rA, ok := resp.Network.GetRouterAddressOk(); ok {
+		rtrAddr = rA
+	}
+
+	net, diags := postgresflexalphadatasource.NewNetworkValue(
+		postgresflexalphadatasource.NetworkValue{}.AttributeTypes(ctx),
+		map[string]attr.Value{
+			"access_scope":     types.StringValue(string(resp.Network.GetAccessScope())),
+			"acl":              netAcl,
+			"instance_address": types.StringValue(instAddr),
+			"router_address":   types.StringValue(rtrAddr),
+		},
+	)
+	if diags.HasError() {
+		return fmt.Errorf("failed converting network from response")
+	}
+	m.Network = net
+	return nil
+}
+
+func handleEncryption(m *postgresflexalphadatasource.InstanceModel, resp *postgresflex.GetInstanceResponse) {
+	keyId := ""
+	if keyIdVal, ok := resp.Encryption.GetKekKeyIdOk(); ok {
+		keyId = keyIdVal
+	}
+
+	keyRingId := ""
+	if keyRingIdVal, ok := resp.Encryption.GetKekKeyRingIdOk(); ok {
+		keyRingId = keyRingIdVal
+	}
+
+	keyVersion := ""
+	if keyVersionVal, ok := resp.Encryption.GetKekKeyVersionOk(); ok {
+		keyVersion = keyVersionVal
+	}
+
+	svcAcc := ""
+	if svcAccVal, ok := resp.Encryption.GetServiceAccountOk(); ok {
+		svcAcc = svcAccVal
+	}
+
+	m.Encryption = postgresflexalphadatasource.EncryptionValue{
+		KekKeyId:       types.StringValue(keyId),
+		KekKeyRingId:   types.StringValue(keyRingId),
+		KekKeyVersion:  types.StringValue(keyVersion),
+		ServiceAccount: types.StringValue(svcAcc),
+	}
+}

stackit/internal/services/postgresflexalpha/instance/functions_test.go

@@ -1,8 +1,8 @@
 package postgresflexalpha
 
 import (
-	postgresflex "github.com/mhenselin/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
 	"github.com/stackitcloud/stackit-sdk-go/core/utils"
+	postgresflex "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
 )
 
 //nolint:unused // TODO: remove when used

stackit/internal/services/postgresflexalpha/instance/planModifiers.yaml

@@ -3,6 +3,14 @@ fields:
     modifiers:
       - 'UseStateForUnknown'
 
+  - name: 'connection_info.host'
+    modifiers:
+      - 'UseStateForUnknown'
+
+  - name: 'connection_info.port'
+    modifiers:
+      - 'UseStateForUnknown'
+
   - name: 'encryption.kek_key_id'
     validators:
       - validate.NoSeparator

stackit/internal/services/postgresflexalpha/instance/resource.go

@@ -13,14 +13,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/identityschema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	postgresflex "github.com/mhenselin/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/core"
-	postgresflexalpha "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen"
-	postgresflexUtils "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/utils"
-	"github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/utils"
-	wait "github.com/mhenselin/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha"
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
+	postgresflex "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core"
+	postgresflexalpha "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen"
+	postgresflexUtils "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/utils"
+	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils"
+	wait "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha"
 )
 
 const packageName = "postgresflexalpha"
@@ -247,9 +247,9 @@ func (r *instanceResource) Create(
 }
 
 func modelToCreateInstancePayload(netAcl []string, model postgresflexalpha.InstanceModel, replVal int32) postgresflex.CreateInstanceRequestPayload {
-	var enc postgresflex.InstanceEncryption
+	var enc *postgresflex.InstanceEncryption
 	if !model.Encryption.IsNull() && !model.Encryption.IsUnknown() {
-		enc = postgresflex.InstanceEncryption{
+		enc = &postgresflex.InstanceEncryption{
 			KekKeyId:       model.Encryption.KekKeyId.ValueStringPointer(),
 			KekKeyRingId:   model.Encryption.KekKeyRingId.ValueStringPointer(),
 			KekKeyVersion:  model.Encryption.KekKeyVersion.ValueStringPointer(),
@@ -258,7 +258,7 @@ func modelToCreateInstancePayload(netAcl []string, model postgresflexalpha.Insta
 	}
 	payload := postgresflex.CreateInstanceRequestPayload{
 		BackupSchedule: model.BackupSchedule.ValueStringPointer(),
-		Encryption:     &enc,
+		Encryption:     enc,
 		FlavorId:       model.FlavorId.ValueStringPointer(),
 		Name:           model.Name.ValueStringPointer(),
 		Network: &postgresflex.InstanceNetworkCreate{