Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Initialize EnvDescriber in init command for svc and job #4253

Merged
merged 15 commits into from
Dec 6, 2022
Merged

fix: Initialize EnvDescriber in init command for svc and job #4253

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
904b0d9
set placement to private
KollaAdithya Nov 19, 2022
f8b93f1
placement private with failing tests
KollaAdithya Nov 22, 2022
e5dfa17
fix unit tests
KollaAdithya Nov 22, 2022
93eaaab
implement placement private for job
KollaAdithya Nov 23, 2022
aaaf725
add manifest integration tests
KollaAdithya Nov 23, 2022
a8ea76d
remove space
KollaAdithya Nov 23, 2022
22a77e0
address @Janice fb and fix indentations
KollaAdithya Nov 28, 2022
edbfbc7
Merge branch 'aws:mainline' into privateplacement
KollaAdithya Nov 28, 2022
f52ff87
fix integ tests
KollaAdithya Nov 28, 2022
56e36a4
address Wanxian and Penghao fb
KollaAdithya Dec 1, 2022
8d9e5ad
addr fb
KollaAdithya Dec 6, 2022
f01eedc
add comments to initEnvDescrber
KollaAdithya Dec 6, 2022
b06322d
Merge branch 'mainline' into privateplacement
mergify[bot] Dec 6, 2022
a6b2892
initialize EnvDescriber in init for svc and job
KollaAdithya Dec 6, 2022
d38c53a
Merge branch 'aws:mainline' into privateplacement
KollaAdithya Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions internal/pkg/cli/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

awscfn "github.com/aws/copilot-cli/internal/pkg/aws/cloudformation"
"github.com/aws/copilot-cli/internal/pkg/aws/iam"
"github.com/aws/copilot-cli/internal/pkg/describe"
"github.com/aws/copilot-cli/internal/pkg/docker/dockerfile"

"github.com/aws/copilot-cli/internal/pkg/deploy"
Expand Down Expand Up @@ -264,6 +265,17 @@ func newInitOpts(vars initVars) (*initOpts, error) {
initParser: func(s string) dockerfileParser {
return dockerfile.New(fs, s)
},
initEnvDescriber: func(appName string, envName string) (envDescriber, error) {
envDescriber, err := describe.NewEnvDescriber(describe.NewEnvDescriberConfig{
App: appName,
Env: envName,
ConfigStore: configStore,
})
if err != nil {
return nil, fmt.Errorf("initiate env describer: %w", err)
Copy link
Contributor

@huanjani huanjani Dec 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit (here and below):
"initialize" instead of "initiate"?
nvm "initiate" is all over our codebase

}
return envDescriber, nil
},
}
o.initWlCmd = &opts
o.schedule = &opts.schedule // Surfaced via pointer for logging
Expand Down Expand Up @@ -292,6 +304,17 @@ func newInitOpts(vars initVars) (*initOpts, error) {
opts.df = dockerfile.New(opts.fs, opts.dockerfilePath)
return opts.df
}
opts.initEnvDescriber = func(appName string, envName string) (envDescriber, error) {
envDescriber, err := describe.NewEnvDescriber(describe.NewEnvDescriberConfig{
App: appName,
Env: envName,
ConfigStore: opts.store,
})
if err != nil {
return nil, fmt.Errorf("initiate env describer: %w", err)
}
return envDescriber, nil
}
o.initWlCmd = &opts
o.port = &opts.port // Surfaced via pointer for logging.
o.initWkldVars = &opts.initWkldVars
Expand Down