update API dependency, fix up tests

Author: kenjenkins

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/hashicorp/terraform-plugin-go v0.25.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/iancoleman/strcase v0.3.0
-	github.com/pomerium/enterprise-client-go v0.28.1-0.20250310151140-91b9684b1537
+	github.com/pomerium/enterprise-client-go v0.28.1-0.20250313205349-eaa1c8257711
 	github.com/pomerium/pomerium v0.28.1-0.20250313134608-c4a5502f49f5
 	github.com/rs/zerolog v1.33.0
 	github.com/stretchr/testify v1.10.0

go.sum

@@ -78,8 +78,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pomerium/enterprise-client-go v0.28.1-0.20250310151140-91b9684b1537 h1:5zM4pm7dPXWMx2Eq0G7XuoQJV5gZqMbjiWjRq6YH5Ws=
-github.com/pomerium/enterprise-client-go v0.28.1-0.20250310151140-91b9684b1537/go.mod h1:36+cCZpNgJQb5B1+y4rCcyQ8CM865NBNmEAQFS+73DQ=
+github.com/pomerium/enterprise-client-go v0.28.1-0.20250313205349-eaa1c8257711 h1:T6hLEgz5RAqKVJ2+gaRx9U1Rqlrbiii+jwBDqVh7QxM=
+github.com/pomerium/enterprise-client-go v0.28.1-0.20250313205349-eaa1c8257711/go.mod h1:36+cCZpNgJQb5B1+y4rCcyQ8CM865NBNmEAQFS+73DQ=
 github.com/pomerium/pomerium v0.28.1-0.20250313134608-c4a5502f49f5 h1:J7uXUwA8vk1O0sD9lkgi6H9v8lxXVaoH3rIJZ8+Arpw=
 github.com/pomerium/pomerium v0.28.1-0.20250313134608-c4a5502f49f5/go.mod h1:AR7TsCCxEbz1ZLKRPJSrmBHRqPewjPEac2LXsFTc/08=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=

internal/provider/route_model.go

@@ -590,7 +590,7 @@ func ConvertRouteToPB(
 		pbRoute.EnableGoogleCloudServerlessAuthentication = src.EnableGoogleCloudServerlessAuthentication.ValueBool()
 	}
 	pbRoute.KubernetesServiceAccountTokenFile = src.KubernetesServiceAccountTokenFile.ValueStringPointer()
-	EnumValueToPBWithDefault(&pbRoute.JwtIssuerFormat, src.JWTIssuerFormat, pb.IssuerFormat_IssuerHostOnly, &diagnostics)
+	pbRoute.JwtIssuerFormat = ToIssuerFormat(src.JWTIssuerFormat)
 	pbRoute.RewriteResponseHeaders = rewriteHeadersToPB(src.RewriteResponseHeaders)
 	pbRoute.BearerTokenFormat = ToBearerTokenFormat(src.BearerTokenFormat)
 	ToRouteStringList(ctx, &pbRoute.IdpAccessTokenAllowedAudiences, src.IDPAccessTokenAllowedAudiences, &diagnostics)
@@ -652,7 +652,7 @@ func ConvertRouteFromPB(
 		dst.EnableGoogleCloudServerlessAuthentication = types.BoolValue(true)
 	}
 	dst.KubernetesServiceAccountTokenFile = types.StringPointerValue(src.KubernetesServiceAccountTokenFile)
-	dst.JWTIssuerFormat = EnumValueFromPB(src.JwtIssuerFormat)
+	dst.JWTIssuerFormat = FromIssuerFormat(src.JwtIssuerFormat)
 	dst.RewriteResponseHeaders = rewriteHeadersFromPB(src.RewriteResponseHeaders)
 	dst.BearerTokenFormat = FromBearerTokenFormat(src.BearerTokenFormat)
 	dst.IDPAccessTokenAllowedAudiences = FromStringList(src.IdpAccessTokenAllowedAudiences)

internal/provider/route_model_test.go

@@ -62,7 +62,7 @@ func TestConvertRoute(t *testing.T) {
 		LogoUrl:                          ptr("https://logo.example.com/logo.png"),
 		EnableGoogleCloudServerlessAuthentication: true,
 		KubernetesServiceAccountTokenFile:         ptr("/path/to/token"),
-		JwtIssuerFormat:                           pb.IssuerFormat_IssuerURI,
+		JwtIssuerFormat:                           pb.IssuerFormat_IssuerURI.Enum(),
 		BearerTokenFormat:                         pb.BearerTokenFormat_BEARER_TOKEN_FORMAT_IDP_ACCESS_TOKEN.Enum(),
 		IdpAccessTokenAllowedAudiences:            &pb.Route_StringList{Values: []string{"aud1", "aud2"}},
 		LoadBalancingPolicy:                       pb.LoadBalancingPolicy_LOAD_BALANCING_POLICY_ROUND_ROBIN.Enum(),
@@ -186,7 +186,7 @@ func TestConvertRoute(t *testing.T) {
 		LogoURL:                       types.StringValue("https://logo.example.com/logo.png"),
 		EnableGoogleCloudServerlessAuthentication: types.BoolValue(true),
 		KubernetesServiceAccountTokenFile:         types.StringValue("/path/to/token"),
-		JWTIssuerFormat:                           types.StringValue("IssuerURI"),
+		JWTIssuerFormat:                           types.StringValue("uri"),
 		BearerTokenFormat:                         types.StringValue("idp_access_token"),
 		IDPAccessTokenAllowedAudiences:            types.SetValueMust(types.StringType, []attr.Value{types.StringValue("aud1"), types.StringValue("aud2")}),
 		LoadBalancingPolicy:                       types.StringValue("round_robin"),

internal/provider/settings_model_test.go

@@ -72,6 +72,7 @@ func TestConvertSettingsToPB(t *testing.T) {
 		InstallationId:                  proto.String("INSTALLATION_ID"),
 		JwtClaimsHeaders:                map[string]string{"X": "Y"},
 		JwtGroupsFilter:                 &pb.JwtGroupsFilter{InferFromPpl: proto.Bool(true), Groups: []string{"z"}},
+		JwtIssuerFormat:                 pb.IssuerFormat_IssuerURI.Enum(),
 		LogLevel:                        proto.String("debug"),
 		LogoUrl:                         proto.String("https://logo.example.com"),
 		MetricsAddress:                  proto.String("127.0.0.1:9999"),
@@ -139,6 +140,7 @@ func TestConvertSettingsToPB(t *testing.T) {
 		InstallationID:                  types.StringValue("INSTALLATION_ID"),
 		JWTClaimsHeaders:                types.MapValueMust(types.StringType, map[string]attr.Value{"X": types.StringValue("Y")}),
 		JWTGroupsFilter:                 types.ObjectValueMust(map[string]attr.Type{"infer_from_ppl": types.BoolType, "groups": types.ListType{ElemType: types.StringType}}, map[string]attr.Value{"infer_from_ppl": types.BoolValue(true), "groups": types.ListValueMust(types.StringType, []attr.Value{types.StringValue("z")})}),
+		JWTIssuerFormat:                 types.StringValue("uri"),
 		LogLevel:                        types.StringValue("debug"),
 		LogoURL:                         types.StringValue("https://logo.example.com"),
 		MetricsAddress:                  types.StringValue("127.0.0.1:9999"),