Skip to content

Commit e10df95

Browse files
jordanstephensjordanstephens
committed
upgrade defang cli
1 parent 6fcd182 commit e10df95

File tree

9 files changed

+42
-28
lines changed

9 files changed

+42
-28
lines changed

‎examples/dotnet/provider-defang.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="Pulumi" Version="3.*" />
10-
<PackageReference Include="DefangLabs.Defang" Version="1.2.0-alpha.1744837289" />
10+
<PackageReference Include="DefangLabs.Defang" Version="1.2.0-alpha.1744837356" />
1111
</ItemGroup>
1212

1313
</Project>

‎examples/go/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.20
44

55
require (
66
github.com/pulumi/pulumi/sdk/v3 v3.30.0
7-
github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744837289
7+
github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744837356
88
)

‎examples/nodejs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"dependencies": {
77
"typescript": "^4.0.0",
88
"@pulumi/pulumi": "^3.0.0",
9-
"@defang-io/pulumi-defang": "1.2.0-alpha.1744837289"
9+
"@defang-io/pulumi-defang": "1.2.0-alpha.1744837356"
1010
}
1111
}

‎examples/python/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pulumi-defang==1.2.0-alpha.1744837289
1+
pulumi-defang==1.2.0-alpha.1744837356
22
pulumi>=3.0.0,<4.0.0

‎go.mod‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
toolchain go1.23.8
66

77
require (
8-
github.com/DefangLabs/defang/src v0.0.0-20250410190608-2a72196700f9
8+
github.com/DefangLabs/defang/src v0.0.0-20250422180625-7fcf136500ca
99
github.com/blang/semver v3.5.1+incompatible
1010
github.com/compose-spec/compose-go/v2 v2.4.3
1111
github.com/distribution/reference v0.5.0
@@ -19,7 +19,7 @@ require (
1919
github.com/pulumi/pulumi/sdk/v3 v3.154.0
2020
github.com/stretchr/testify v1.10.0
2121
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
22-
golang.org/x/sync v0.11.0
22+
golang.org/x/sync v0.12.0
2323
google.golang.org/protobuf v1.35.1
2424
gopkg.in/yaml.v3 v3.0.1
2525
gotest.tools/v3 v3.4.0
@@ -130,6 +130,7 @@ require (
130130
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
131131
github.com/kevinburke/ssh_config v1.2.0 // indirect
132132
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
133+
github.com/mark3labs/mcp-go v0.21.0 // indirect
133134
github.com/mattn/go-colorable v0.1.13 // indirect
134135
github.com/mattn/go-isatty v0.0.20 // indirect
135136
github.com/mattn/go-localereader v0.0.1 // indirect
@@ -179,6 +180,7 @@ require (
179180
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
180181
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
181182
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
183+
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
182184
github.com/zclconf/go-cty v1.14.0 // indirect
183185
go.opencensus.io v0.24.0 // indirect
184186
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
@@ -190,13 +192,13 @@ require (
190192
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
191193
go.opentelemetry.io/otel/trace v1.29.0 // indirect
192194
go.uber.org/atomic v1.11.0 // indirect
193-
golang.org/x/crypto v0.35.0 // indirect
195+
golang.org/x/crypto v0.36.0 // indirect
194196
golang.org/x/mod v0.19.0 // indirect
195-
golang.org/x/net v0.36.0 // indirect
197+
golang.org/x/net v0.38.0 // indirect
196198
golang.org/x/oauth2 v0.24.0 // indirect
197-
golang.org/x/sys v0.30.0 // indirect
198-
golang.org/x/term v0.29.0 // indirect
199-
golang.org/x/text v0.22.0 // indirect
199+
golang.org/x/sys v0.31.0 // indirect
200+
golang.org/x/term v0.30.0 // indirect
201+
golang.org/x/text v0.23.0 // indirect
200202
golang.org/x/time v0.8.0 // indirect
201203
golang.org/x/tools v0.23.0 // indirect
202204
google.golang.org/api v0.203.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
8888
github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
8989
github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
9090
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
91-
github.com/DefangLabs/defang/src v0.0.0-20250410190608-2a72196700f9 h1:yLtxDWegY5w3mMxqdNu0vwOWpjY1kPMU1jW/vLis5pM=
92-
github.com/DefangLabs/defang/src v0.0.0-20250410190608-2a72196700f9/go.mod h1:TRHyb8SyPQ9x4q5OHPd9X9qpXibvftHQkIaF7bntqHo=
91+
github.com/DefangLabs/defang/src v0.0.0-20250422180625-7fcf136500ca h1:EgnIVOqX/MsmBYxcY4CaGDYECTMgjPaesbdfdcluw2I=
92+
github.com/DefangLabs/defang/src v0.0.0-20250422180625-7fcf136500ca/go.mod h1:hdTDjetomZd727Lmii7AyfSVy5VnW2rgM8gX/GDqWLI=
9393
github.com/DefangLabs/secret-detector v0.0.0-20250108223530-c2b44d4c1f8f h1:RTbUqLhPxejgK92ifVdMTIW9H23QLlscy8QXPDTfaL4=
9494
github.com/DefangLabs/secret-detector v0.0.0-20250108223530-c2b44d4c1f8f/go.mod h1:2UjtD/G/Sy2FxoHpxKnzHTXMpRURecwYal8HgbxcvkY=
9595
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg=
@@ -445,6 +445,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
445445
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
446446
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
447447
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
448+
github.com/mark3labs/mcp-go v0.21.0 h1:oyEtiXg8PnrVEFis9b1AwbiUWF2dTbyBP5yLo7SruXE=
449+
github.com/mark3labs/mcp-go v0.21.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
448450
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
449451
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
450452
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -604,6 +606,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
604606
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
605607
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
606608
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
609+
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
610+
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
607611
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
608612
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
609613
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -652,8 +656,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
652656
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
653657
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
654658
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
655-
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
656-
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
659+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
660+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
657661
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
658662
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
659663
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -727,8 +731,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
727731
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
728732
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
729733
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
730-
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
731-
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
734+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
735+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
732736
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
733737
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
734738
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -751,8 +755,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
751755
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
752756
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
753757
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
754-
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
755-
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
758+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
759+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
756760
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
757761
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
758762
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -800,12 +804,12 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
800804
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
801805
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
802806
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
803-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
804-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
807+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
808+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
805809
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
806810
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
807-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
808-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
811+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
812+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
809813
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
810814
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
811815
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -815,8 +819,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
815819
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
816820
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
817821
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
818-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
819-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
822+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
823+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
820824
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
821825
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
822826
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defang",
3-
"version": "1.1.0-beta.11",
3+
"version": "1.2.0-alpha.1744837356",
44
"description": "Take your app from Docker Compose to a secure and scalable cloud deployment with Pulumi.",
55
"keywords": [
66
"category/cloud",
@@ -1420,7 +1420,7 @@
14201420
},
14211421
"deploymentMode": {
14221422
"type": "string",
1423-
"description": "The deployment mode to use. Can be one of [DEVELOPMENT STAGING PRODUCTION].",
1423+
"description": "The deployment mode to use. Can be one of [STAGING PRODUCTION DEVELOPMENT].",
14241424
"default": "DEVELOPMENT"
14251425
}
14261426
},

‎provider/project.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,11 @@ func deployProject(
217217
return nil, fmt.Errorf("failed to deploy: %w", err)
218218
}
219219

220-
err = cli.WaitAndTail(ctx, project, fabric, provider, deploy, -1, deployTime, true)
220+
err = cli.TailAndMonitor(ctx, project, provider, -1, cli.TailOptions{
221+
Deployment: deploy.GetEtag(),
222+
Since: deployTime,
223+
Verbose: true,
224+
})
221225
if err != nil {
222226
return nil, fmt.Errorf("failed to tail: %w", err)
223227
}

‎tests/cloud_provider_mock.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ func (c CloudProviderMock) Follow(
144144
return stream, nil
145145
}
146146

147+
func (c CloudProviderMock) GetDeploymentStatus(context.Context) error {
148+
return nil
149+
}
150+
147151
func (c CloudProviderMock) GetProjectUpdate(context.Context, string) (*defangv1.ProjectUpdate, error) {
148152
taskRole := "service1-role"
149153
projectOutputs := provider.V1DefangProjectOutputs{

0 commit comments

Comments
 (0)