From 269072bdf5d03f7968fd6840ad4b140f94a538af Mon Sep 17 00:00:00 2001 From: Tim Holm Date: Fri, 10 May 2024 12:31:15 +1000 Subject: [PATCH] upgrade az pulumi plugin and reconfigure api management auth --- cloud/azure/deploy/api.go | 4 ++-- cloud/azure/deploy/deploy.go | 4 ++-- cloud/azure/deploy/httpproxy.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cloud/azure/deploy/api.go b/cloud/azure/deploy/api.go index 26eeb7afb..54898261c 100644 --- a/cloud/azure/deploy/api.go +++ b/cloud/azure/deploy/api.go @@ -24,7 +24,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/pkg/errors" - apimanagement "github.com/pulumi/pulumi-azure-native-sdk/apimanagement/v20201201" + apimanagement "github.com/pulumi/pulumi-azure-native-sdk/apimanagement" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" common "github.com/nitrictech/nitric/cloud/common/deploy/tags" @@ -222,7 +222,7 @@ func (p *NitricAzurePulumiProvider) Api(ctx *pulumi.Context, parent pulumi.Resou OperationId: pulumi.String(op.OperationID), PolicyId: pulumi.String("policy"), Format: pulumi.String("xml"), - Value: pulumi.Sprintf(policyTemplate, pulumi.Sprintf("%s%s%s", app.App.LatestRevisionFqdn, "/x-nitric-api/", name), jwtTemplateString, p.ContainerEnv.ManagedUser.ClientId, p.ContainerEnv.ManagedUser.ClientId), + Value: pulumi.Sprintf(policyTemplate, pulumi.Sprintf("%s%s%s", app.App.LatestRevisionFqdn, "/x-nitric-api/", name), jwtTemplateString, app.Sp.ClientID, p.ContainerEnv.ManagedUser.ClientId), }, pulumi.Parent(api)) if err != nil { return errors.WithMessage(err, "NewApiOperationPolicy "+op.OperationID) diff --git a/cloud/azure/deploy/deploy.go b/cloud/azure/deploy/deploy.go index 694a00e8d..53abb032c 100644 --- a/cloud/azure/deploy/deploy.go +++ b/cloud/azure/deploy/deploy.go @@ -30,7 +30,7 @@ import ( "github.com/nitrictech/nitric/core/pkg/logger" resourcespb "github.com/nitrictech/nitric/core/pkg/proto/resources/v1" "github.com/pkg/errors" - apimanagement "github.com/pulumi/pulumi-azure-native-sdk/apimanagement/v20201201" + apimanagement "github.com/pulumi/pulumi-azure-native-sdk/apimanagement" "github.com/pulumi/pulumi-azure-native-sdk/authorization" "github.com/pulumi/pulumi-azure-native-sdk/eventgrid" "github.com/pulumi/pulumi-azure-native-sdk/keyvault" @@ -84,7 +84,7 @@ type NitricAzurePulumiProvider struct { var _ provider.NitricPulumiProvider = (*NitricAzurePulumiProvider)(nil) const ( - pulumiAzureNativeVersion = "1.95.0" + pulumiAzureNativeVersion = "2.40.0" pulumiAzureVersion = "5.52.0" ) diff --git a/cloud/azure/deploy/httpproxy.go b/cloud/azure/deploy/httpproxy.go index 26c8778a2..fc8fc75f6 100644 --- a/cloud/azure/deploy/httpproxy.go +++ b/cloud/azure/deploy/httpproxy.go @@ -21,7 +21,7 @@ import ( "github.com/nitrictech/nitric/cloud/common/deploy/resources" deploymentspb "github.com/nitrictech/nitric/core/pkg/proto/deployments/v1" "github.com/pkg/errors" - apimanagement "github.com/pulumi/pulumi-azure-native-sdk/apimanagement/v20201201" + apimanagement "github.com/pulumi/pulumi-azure-native-sdk/apimanagement" "github.com/pulumi/pulumi-azure-native-sdk/managedidentity" "github.com/pulumi/pulumi/sdk/v3/go/pulumi"