@@ -21,6 +21,7 @@ import (
2121 "crypto/md5"
2222 "encoding/hex"
2323 "encoding/json"
24+ "fmt"
2425 "io/ioutil"
2526 "os"
2627
@@ -35,9 +36,10 @@ import (
3536 "github.com/pulumi/pulumi/sdk/v3/go/auto"
3637 "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
3738
38- "github.com/nitrictech/cli/pkg/provider/pulumi/types "
39+ "github.com/nitrictech/cli/pkg/provider/pulumi/common "
3940 "github.com/nitrictech/cli/pkg/stack"
4041 "github.com/nitrictech/cli/pkg/target"
42+ "github.com/nitrictech/cli/pkg/utils"
4143 v1 "github.com/nitrictech/nitric/pkg/api/nitric/v1"
4244)
4345
@@ -47,31 +49,56 @@ type awsProvider struct {
4749 tmpDir string
4850}
4951
50- func New (s * stack.Stack , t * target.Target ) types .PulumiProvider {
52+ func New (s * stack.Stack , t * target.Target ) common .PulumiProvider {
5153 return & awsProvider {s : s , t : t }
5254}
5355
54- func (a * awsProvider ) PluginName () string {
55- return "aws"
56+ func (a * awsProvider ) Plugins () []common.Plugin {
57+ return []common.Plugin {
58+ {
59+ Name : "aws" ,
60+ Version : "v4.37.1" ,
61+ },
62+ }
5663}
5764
58- func (a * awsProvider ) PluginVersion () string {
59- return "v4.0.0"
65+ func (a * awsProvider ) SupportedRegions () []string {
66+ return []string {
67+ "us-east-1" ,
68+ "us-west-1" ,
69+ "us-west-2" ,
70+ "eu-west-1" ,
71+ "eu-central-1" ,
72+ "ap-southeast-1" ,
73+ "ap-northeast-1" ,
74+ "ap-southeast-2" ,
75+ "ap-northeast-2" ,
76+ "sa-east-1" ,
77+ "cn-north-1" ,
78+ "ap-south-1" ,
79+ }
6080}
6181
62- func (a * awsProvider ) Configure (ctx context.Context , autoStack * auto.Stack ) error {
63- if a .t .Region != "" {
64- return autoStack .SetConfig (ctx , "aws:region" , auto.ConfigValue {Value : a .t .Region })
82+ func (a * awsProvider ) Validate () error {
83+ found := false
84+ for _ , r := range a .SupportedRegions () {
85+ if r == a .t .Region {
86+ found = true
87+ break
88+ }
89+ }
90+ if ! found {
91+ return utils .NewNotSupportedErr (fmt .Sprintf ("region %s not supported on provider %s" , a .t .Region , a .t .Provider ))
6592 }
6693 return nil
6794}
6895
69- func commonTags (ctx * pulumi.Context , name string ) pulumi.StringMap {
70- return pulumi.StringMap {
71- "x-nitric-project" : pulumi .String (ctx .Project ()),
72- "x-nitric-stack" : pulumi .String (ctx .Stack ()),
73- "x-nitric-name" : pulumi .String (name ),
96+ func (a * awsProvider ) Configure (ctx context.Context , autoStack * auto.Stack ) error {
97+ if a .t .Region != "" {
98+ return autoStack .SetConfig (ctx , "aws:region" , auto.ConfigValue {Value : a .t .Region })
7499 }
100+
101+ return nil
75102}
76103
77104func md5Hash (b []byte ) string {
@@ -124,7 +151,7 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
124151 // FIXME: Autonaming of topics disabled until improvements to
125152 // nitric topic name discovery is made for SNS topics.
126153 Name : pulumi .StringPtr (k ),
127- Tags : commonTags (ctx , k ),
154+ Tags : common . Tags (ctx , k ),
128155 })
129156 if err != nil {
130157 return errors .WithMessage (err , "sns topic " + k )
@@ -134,7 +161,7 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
134161 buckets := map [string ]* s3.Bucket {}
135162 for k := range a .s .Buckets {
136163 buckets [k ], err = s3 .NewBucket (ctx , k , & s3.BucketArgs {
137- Tags : commonTags (ctx , k ),
164+ Tags : common . Tags (ctx , k ),
138165 })
139166 if err != nil {
140167 return errors .WithMessage (err , "s3 bucket " + k )
@@ -144,7 +171,7 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
144171 queues := map [string ]* sqs.Queue {}
145172 for k := range a .s .Queues {
146173 queues [k ], err = sqs .NewQueue (ctx , k , & sqs.QueueArgs {
147- Tags : commonTags (ctx , k ),
174+ Tags : common . Tags (ctx , k ),
148175 })
149176 if err != nil {
150177 return errors .WithMessage (err , "sqs queue " + k )
@@ -167,7 +194,7 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
167194 HashKey : pulumi .String ("_pk" ),
168195 RangeKey : pulumi .String ("_sk" ),
169196 BillingMode : pulumi .String ("PAY_PER_REQUEST" ),
170- Tags : commonTags (ctx , k ),
197+ Tags : common . Tags (ctx , k ),
171198 })
172199 if err != nil {
173200 return errors .WithMessage (err , "dynamodb table " + k )
@@ -191,46 +218,48 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
191218 funcs := map [string ]* Lambda {}
192219 principalMap := make (map [v1.ResourceType ]map [string ]* iam.Role )
193220 principalMap [v1 .ResourceType_Function ] = make (map [string ]* iam.Role )
194- for k , f := range a .s .Functions {
195- image , err := newECRImage (ctx , f .Name , & ECRImageArgs {
196- LocalImageName : f .ImageTagName (a .s , "" ),
197- SourceImageName : f .ImageTagName (a .s , a .t .Provider ),
198- AuthToken : authToken ,
199- TempDir : a .tmpDir })
200- if err != nil {
201- return errors .WithMessage (err , "function image tag " + f .Name )
202- }
203- funcs [k ], err = newLambda (ctx , k , & LambdaArgs {
204- Topics : topics ,
205- DockerImage : image .DockerImage ,
206- Compute : & f ,
221+
222+ computes := []stack.Compute {}
223+ for _ , c := range a .s .Functions {
224+ copy := c
225+ computes = append (computes , & copy )
226+ }
227+ for _ , c := range a .s .Containers {
228+ copy := c
229+ computes = append (computes , & copy )
230+ }
231+ for _ , c := range computes {
232+ localImageName := c .ImageTagName (a .s , "" )
233+
234+ repo , err := ecr .NewRepository (ctx , localImageName , & ecr.RepositoryArgs {
235+ Tags : common .Tags (ctx , localImageName ),
207236 })
208237 if err != nil {
209- return errors . WithMessage ( err , "lambda function " + f . Name )
238+ return err
210239 }
211240
212- principalMap [v1.ResourceType_Function ][k ] = funcs [k ].Role
213- }
214-
215- for k , c := range a .s .Containers {
216- image , err := newECRImage (ctx , c .Name , & ECRImageArgs {
217- LocalImageName : c .ImageTagName (a .s , "" ),
241+ image , err := common .NewImage (ctx , c .Unit ().Name , & common.ImageArgs {
242+ LocalImageName : localImageName ,
218243 SourceImageName : c .ImageTagName (a .s , a .t .Provider ),
219- AuthToken : authToken ,
244+ RepositoryUrl : repo .RepositoryUrl ,
245+ Server : pulumi .String (authToken .ProxyEndpoint ),
246+ Username : pulumi .String (authToken .UserName ),
247+ Password : pulumi .String (authToken .Password ),
220248 TempDir : a .tmpDir })
221249 if err != nil {
222- return errors .WithMessage (err , "function image tag " + c .Name )
250+ return errors .WithMessage (err , "function image tag " + c .Unit (). Name )
223251 }
224- funcs [k ], err = newLambda (ctx , k , & LambdaArgs {
252+
253+ funcs [c .Unit ().Name ], err = newLambda (ctx , c .Unit ().Name , & LambdaArgs {
225254 Topics : topics ,
226255 DockerImage : image .DockerImage ,
227- Compute : & c ,
256+ Compute : c ,
228257 })
229258 if err != nil {
230- return errors .WithMessage (err , "lambda container " + c .Name )
259+ return errors .WithMessage (err , "lambda container " + c .Unit (). Name )
231260 }
232261
233- principalMap [v1.ResourceType_Function ][k ] = funcs [k ].Role
262+ principalMap [v1 .ResourceType_Function ][c . Unit (). Name ] = funcs [c . Unit (). Name ].Role
234263 }
235264
236265 for k , v := range a .s .ApiDocs {
@@ -244,7 +273,6 @@ func (a *awsProvider) Deploy(ctx *pulumi.Context) error {
244273
245274 for _ , p := range a .s .Policies {
246275 policyName , err := policyResourceName (p )
247-
248276 if err != nil {
249277 return err
250278 }
0 commit comments