base64 decode string before unmarhsalling json

Author: jordanstephens

examples/dotnet/provider-defang.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Pulumi" Version="3.*" />
-		<PackageReference Include="DefangLabs.Defang" Version="1.2.0-alpha.1744682110" />
+		<PackageReference Include="DefangLabs.Defang" Version="1.2.0-alpha.1744826391" />
 	</ItemGroup>
 
 </Project>

examples/go/go.mod

@@ -4,5 +4,5 @@ go 1.20
 
 require (
 	github.com/pulumi/pulumi/sdk/v3 v3.30.0
-	github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744682110
+	github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744826391
 )

examples/nodejs/package.json

@@ -6,6 +6,6 @@
 	"dependencies": {
 		"typescript": "^4.0.0",
 		"@pulumi/pulumi": "^3.0.0",
-		"@defang-io/pulumi-defang": "1.2.0-alpha.1744682110"
+		"@defang-io/pulumi-defang": "1.2.0-alpha.1744826391"
 	}
 }

examples/python/requirements.txt

@@ -1,2 +1,2 @@
-pulumi-defang==1.2.0-alpha.1744682110
+pulumi-defang==1.2.0-alpha.1744826391
 pulumi>=3.0.0,<4.0.0

provider/cmd/pulumi-resource-defang/schema.json

@@ -1,6 +1,6 @@
 {
   "name": "defang",
-  "version": "1.1.0-beta.9",
+  "version": "1.1.0-beta.10",
   "description": "Take your app from Docker Compose to a secure and scalable cloud deployment with Pulumi.",
   "keywords": [
     "category/cloud",

provider/project.go

@@ -16,6 +16,7 @@ package provider
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -279,8 +280,13 @@ func getProjectState(etag string, projectUpdate *defangv1.ProjectUpdate) (Projec
 		return state, errNilProjectOutputs
 	}
 
+	decodedProjectOutputs, err := base64.StdEncoding.DecodeString(string(projectOutputs))
+	if err != nil {
+		return state, fmt.Errorf("failed to base64 decode project outputs: %w", err)
+	}
+
 	var v1DefangProjectOutputs V1DefangProjectOutputs
-	err := json.Unmarshal(projectOutputs, &v1DefangProjectOutputs)
+	err = json.Unmarshal(decodedProjectOutputs, &v1DefangProjectOutputs)
 	if err != nil {
 		return state, fmt.Errorf("failed to unmarshal project update outputs: %w", err)
 	}

tests/cloud_provider_mock.go

@@ -2,6 +2,7 @@ package tests
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 
@@ -159,6 +160,8 @@ func (c CloudProviderMock) GetProjectUpdate(context.Context, string) (*defangv1.
 		return nil, fmt.Errorf("failed to marshal project outputs: %w", err)
 	}
 
+	encodedProjectOutputs := base64.StdEncoding.EncodeToString(projectOutputsJSON)
+
 	return &defangv1.ProjectUpdate{
 		AlbArn: "arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188",
 		Services: []*defangv1.ServiceInfo{
@@ -170,7 +173,7 @@ func (c CloudProviderMock) GetProjectUpdate(context.Context, string) (*defangv1.
 			},
 		},
 		ProjectOutputsVersion: 1,
-		ProjectOutputs:        projectOutputsJSON,
+		ProjectOutputs:        []byte(encodedProjectOutputs),
 	}, nil
 }