Upgrade to latest p-go-provider and switch to AssetOrArchive

Author: thomas11

examples/ec2_dir_copy/index.ts

@@ -70,11 +70,11 @@ export = async () => {
     const archive = new pulumi.asset.FileArchive(from);
     const copy = new remote.Copy("copy", {
         connection,
-        archive: archive,
+        source: archive,
         remotePath: to,
     }, { dependsOn: poll });
 
-    // Run `ls` on the remote to verify that the expected files were copied there.
+    // Verify that the expected files were copied to the remote.
     // We want to run this after each copy, i.e., when something changed, but not otherwise to avoid unclean refreshes.
     // We use the hash of the source directory as a trigger to achieve this, since the trigger needs to be a primitive
     // value and we cannot use the Copy resource itself.

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

@@ -472,14 +472,6 @@
     "command:remote:Copy": {
       "description": "Copy an Asset or Archive to a remote host.",
       "properties": {
-        "archive": {
-          "$ref": "pulumi.json#/Archive",
-          "description": "An archive to upload as the source of the copy. It must be a path based archive. Only one of Asset or Archive can be set."
-        },
-        "asset": {
-          "$ref": "pulumi.json#/Asset",
-          "description": "An asset to upload as the source of the copy. It must be a path based asset. Only one of Asset or Archive can be set."
-        },
         "connection": {
           "$ref": "#/types/command:remote:Connection",
           "description": "The parameters with which to connect to the remote host.",
@@ -489,6 +481,10 @@
           "type": "string",
           "description": "The destination path in the remote host."
         },
+        "source": {
+          "$ref": "pulumi.json#/Asset",
+          "description": "An asset or an archive to upload as the source of the copy. It must be path based."
+        },
         "triggers": {
           "type": "array",
           "items": {
@@ -500,17 +496,10 @@
       "type": "object",
       "required": [
         "connection",
-        "remotePath"
+        "remotePath",
+        "source"
       ],
       "inputProperties": {
-        "archive": {
-          "$ref": "pulumi.json#/Archive",
-          "description": "An archive to upload as the source of the copy. It must be a path based archive. Only one of Asset or Archive can be set."
-        },
-        "asset": {
-          "$ref": "pulumi.json#/Asset",
-          "description": "An asset to upload as the source of the copy. It must be a path based asset. Only one of Asset or Archive can be set."
-        },
         "connection": {
           "$ref": "#/types/command:remote:Connection",
           "description": "The parameters with which to connect to the remote host.",
@@ -520,6 +509,10 @@
           "type": "string",
           "description": "The destination path in the remote host."
         },
+        "source": {
+          "$ref": "pulumi.json#/Asset",
+          "description": "An asset or an archive to upload as the source of the copy. It must be path based."
+        },
         "triggers": {
           "type": "array",
           "items": {
@@ -530,7 +523,8 @@
       },
       "requiredInputs": [
         "connection",
-        "remotePath"
+        "remotePath",
+        "source"
       ]
     }
   },

provider/go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/gliderlabs/ssh v0.3.7
 	github.com/gobwas/glob v0.2.3
 	github.com/pkg/sftp v1.13.6
-	github.com/pulumi/pulumi-go-provider v0.17.0
-	github.com/pulumi/pulumi/sdk/v3 v3.116.1
+	github.com/pulumi/pulumi-go-provider v0.19.0
+	github.com/pulumi/pulumi/sdk/v3 v3.120.0
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/crypto v0.23.0
+	golang.org/x/crypto v0.24.0
 )
 
 require (
@@ -24,10 +24,14 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/charmbracelet/bubbles v0.18.0 // indirect
-	github.com/charmbracelet/bubbletea v0.26.2 // indirect
-	github.com/charmbracelet/lipgloss v0.10.0 // indirect
+	github.com/charmbracelet/bubbletea v0.26.4 // indirect
+	github.com/charmbracelet/lipgloss v0.11.0 // indirect
+	github.com/charmbracelet/x/ansi v0.1.2 // indirect
+	github.com/charmbracelet/x/input v0.1.2 // indirect
+	github.com/charmbracelet/x/term v0.1.1 // indirect
+	github.com/charmbracelet/x/windows v0.1.2 // indirect
 	github.com/cheggaaa/pb v1.0.29 // indirect
-	github.com/cloudflare/circl v1.3.8 // indirect
+	github.com/cloudflare/circl v1.3.9 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/djherbis/times v1.6.0 // indirect
@@ -57,7 +61,6 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/natefinch/atomic v1.0.1 // indirect
 	github.com/opentracing/basictracer-go v1.1.0 // indirect
@@ -69,8 +72,8 @@ require (
 	github.com/pkg/term v1.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
-	github.com/pulumi/esc v0.8.3 // indirect
-	github.com/pulumi/pulumi/pkg/v3 v3.116.1 // indirect
+	github.com/pulumi/esc v0.9.1 // indirect
+	github.com/pulumi/pulumi/pkg/v3 v3.120.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
@@ -86,19 +89,20 @@ require (
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/zclconf/go-cty v1.14.4 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3 // indirect
 	google.golang.org/grpc v1.64.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/frand v1.4.2 // indirect