Skip to content

Commit 6852f13

Browse files
lionellolionello
committed
Add storage account creation
1 parent 6726eaf commit 6852f13

File tree

8 files changed

+205
-86
lines changed

8 files changed

+205
-86
lines changed

‎src/go.mod‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ require (
2020
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
2121
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerinstance/armcontainerinstance/v2 v2.4.0
2222
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2 v2.1.0
23+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1
2324
github.com/DefangLabs/secret-detector v0.0.0-20250108223530-c2b44d4c1f8f
2425
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
2526
github.com/aws/aws-sdk-go-v2 v1.32.6
@@ -39,7 +40,7 @@ require (
3940
github.com/compose-spec/compose-go/v2 v2.7.2-0.20250715094302-8da9902241f9
4041
github.com/digitalocean/godo v1.131.1
4142
github.com/docker/docker v25.0.6+incompatible
42-
github.com/golang-jwt/jwt/v5 v5.2.2
43+
github.com/golang-jwt/jwt/v5 v5.2.3
4344
github.com/google/uuid v1.6.0
4445
github.com/googleapis/gax-go/v2 v2.14.1
4546
github.com/gorilla/websocket v1.5.0
@@ -55,10 +56,10 @@ require (
5556
github.com/sirupsen/logrus v1.9.3
5657
github.com/spf13/cobra v1.8.0
5758
github.com/spf13/pflag v1.0.6
58-
golang.org/x/mod v0.18.0
59+
golang.org/x/mod v0.25.0
5960
golang.org/x/oauth2 v0.29.0
60-
golang.org/x/sys v0.33.0
61-
golang.org/x/term v0.32.0
61+
golang.org/x/sys v0.34.0
62+
golang.org/x/term v0.33.0
6263
google.golang.org/api v0.229.0
6364
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb
6465
google.golang.org/grpc v1.72.0
@@ -116,8 +117,8 @@ require (
116117
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
117118
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
118119
go.yaml.in/yaml/v3 v3.0.4 // indirect
119-
golang.org/x/crypto v0.38.0 // indirect
120-
golang.org/x/net v0.40.0 // indirect
120+
golang.org/x/crypto v0.40.0 // indirect
121+
golang.org/x/net v0.42.0 // indirect
121122
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f // indirect
122123
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
123124
gopkg.in/ini.v1 v1.66.2 // indirect
@@ -162,8 +163,8 @@ require (
162163
go.opentelemetry.io/otel/metric v1.35.0 // indirect
163164
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
164165
go.opentelemetry.io/otel/trace v1.35.0 // indirect
165-
golang.org/x/sync v0.14.0 // indirect
166-
golang.org/x/text v0.25.0 // indirect
166+
golang.org/x/sync v0.16.0 // indirect
167+
golang.org/x/text v0.27.0 // indirect
167168
golang.org/x/time v0.11.0 // indirect
168-
golang.org/x/tools v0.22.0 // indirect
169+
golang.org/x/tools v0.34.0 // indirect
169170
)

‎src/go.sum‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.
5050
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0/go.mod h1:5kakwfW5CjC9KK+Q4wjXAg+ShuIm2mBMua0ZFj2C8PE=
5151
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2 v2.1.0 h1:seyVIpxalxYmfjoo8MB4rRzWaobMG+KJ2+MAUrEvDGU=
5252
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2 v2.1.0/go.mod h1:M3QD7IyKZBaC4uAKjitTOSOXdcPC6JS1A9oOW3hYjbQ=
53+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
54+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
5355
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
5456
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
5557
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
@@ -190,8 +192,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
190192
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
191193
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
192194
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
193-
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
194-
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
195+
github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0=
196+
github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
195197
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
196198
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
197199
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -365,29 +367,29 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
365367
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
366368
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
367369
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
368-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
369-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
370+
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
371+
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
370372
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
371373
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
372374
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
373-
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
374-
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
375+
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
376+
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
375377
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
376378
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
377379
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
378380
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
379381
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
380382
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
381-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
382-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
383+
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
384+
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
383385
golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
384386
golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
385387
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
386388
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
387389
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
388390
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
389-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
390-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
391+
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
392+
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
391393
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
392394
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
393395
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -400,27 +402,27 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
400402
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
401403
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
402404
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
403-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
404-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
405+
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
406+
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
405407
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
406408
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
407-
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
408-
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
409+
golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
410+
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
409411
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
410412
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
411413
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
412414
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
413-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
414-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
415+
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
416+
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
415417
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
416418
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
417419
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
418420
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
419421
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
420422
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
421423
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
422-
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
423-
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
424+
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
425+
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
424426
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
425427
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
426428
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎src/pkg/clouds/azure/aci/common.go‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package aci
22

33
import (
4-
"errors"
54
"fmt"
65
"os"
76

8-
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
97
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerinstance/armcontainerinstance/v2"
108
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2"
119
"github.com/DefangLabs/defang/src/pkg/clouds/azure"
@@ -15,6 +13,7 @@ type ContainerInstance struct {
1513
azure.Azure
1614
containerGroupProps *armcontainerinstance.ContainerGroupPropertiesProperties
1715
resourceGroupName string
16+
storageAccount string
1817
}
1918

2019
func NewContainerInstance(resourceGroupName string, location azure.Location) *ContainerInstance {
@@ -24,24 +23,11 @@ func NewContainerInstance(resourceGroupName string, location azure.Location) *Co
2423
return &ContainerInstance{
2524
Azure: azure.Azure{Location: location},
2625
resourceGroupName: resourceGroupName, // TODO: append location?
26+
storageAccount: os.Getenv("DEFANG_CD_BUCKET"),
2727
}
2828
}
29-
func newCreds() (string, *azidentity.DefaultAzureCredential, error) {
30-
subscriptionID := os.Getenv("AZURE_SUBSCRIPTION_ID")
31-
if len(subscriptionID) == 0 {
32-
return "", nil, errors.New("environment variable AZURE_SUBSCRIPTION_ID is not set")
33-
}
34-
35-
cred, err := azidentity.NewDefaultAzureCredential(nil)
36-
if err != nil {
37-
return "", nil, fmt.Errorf("failed to create default Azure credentials: %w", err)
38-
}
39-
40-
return subscriptionID, cred, nil
41-
}
42-
4329
func newContainerGroupClient() (*armcontainerinstance.ContainerGroupsClient, error) {
44-
subscriptionID, cred, err := newCreds()
30+
subscriptionID, cred, err := azure.NewCreds()
4531
if err != nil {
4632
return nil, err
4733
}
@@ -54,7 +40,7 @@ func newContainerGroupClient() (*armcontainerinstance.ContainerGroupsClient, err
5440
}
5541

5642
func newContainerClient() (*armcontainerinstance.ContainersClient, error) {
57-
subscriptionID, cred, err := newCreds()
43+
subscriptionID, cred, err := azure.NewCreds()
5844
if err != nil {
5945
return nil, err
6046
}
@@ -67,7 +53,7 @@ func newContainerClient() (*armcontainerinstance.ContainersClient, error) {
6753
}
6854

6955
func newResourceGroupClient() (*armresources.ResourceGroupsClient, error) {
70-
subscriptionID, cred, err := newCreds()
56+
subscriptionID, cred, err := azure.NewCreds()
7157
if err != nil {
7258
return nil, err
7359
}

‎src/pkg/clouds/azure/aci/run.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,28 @@ func (c *ContainerInstance) Run(ctx context.Context, env map[string]string, args
2222
if err != nil {
2323
return nil, err
2424
}
25-
var props armcontainerinstance.ContainerProperties
25+
26+
commandArgs := to.SliceOfPtrs(args...)
27+
var envVars []*armcontainerinstance.EnvironmentVariable
2628
for key, value := range env {
27-
props.EnvironmentVariables = append(props.EnvironmentVariables, &armcontainerinstance.EnvironmentVariable{
29+
envVars = append(envVars, &armcontainerinstance.EnvironmentVariable{
2830
Name: to.Ptr(key),
2931
Value: to.Ptr(value),
3032
})
3133
}
32-
for _, arg := range args {
33-
props.Command = append(props.Command, to.Ptr(arg))
34-
}
3534

3635
clone := *c.containerGroupProps
3736
for i, container := range clone.Containers {
3837
newProps := *container.Properties
39-
newProps.Command = safeAppend(newProps.Command, props.Command...)
40-
newProps.EnvironmentVariables = safeAppend(newProps.EnvironmentVariables, props.EnvironmentVariables...)
38+
newProps.Command = safeAppend(newProps.Command, commandArgs...) // TODO: probably should only be done for the first container
39+
newProps.EnvironmentVariables = safeAppend(newProps.EnvironmentVariables, envVars...)
4140
clone.Containers[i] = &armcontainerinstance.Container{
4241
Name: container.Name,
4342
Properties: &newProps,
4443
}
4544
}
4645

47-
groupName := containerGroupName + "-" + pkg.RandomID()
46+
groupName := containerGroupPrefix + pkg.RandomID()
4847
group := armcontainerinstance.ContainerGroup{
4948
Name: to.Ptr(groupName),
5049
Location: c.Location.Ptr(),

0 commit comments

Comments
 (0)