Skip to content

Commit

Permalink
chore: add alias to the URI and listener rule (#2320)
Browse files Browse the repository at this point in the history
<!-- Provide summary of changes -->
Part of #1188. Preceding PR #2315. This PR:
- add alias to the URI
- add alias to the listener rule
- enable path routing for HTTPS
- move stack related behaviors in `describe` to `describe/stack` pkg
<!-- Issue number, if available. E.g. "Fixes #31", "Addresses #42, 77" -->

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
  • Loading branch information
iamhopaul123 authored May 20, 2021
1 parent 111c578 commit c2d143d
Show file tree
Hide file tree
Showing 35 changed files with 1,286 additions and 1,415 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ gen-mocks: tools
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_backend_service.go -source=./internal/pkg/describe/backend_service.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_service.go -source=./internal/pkg/describe/service.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_describe.go -source=./internal/pkg/describe/describe.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_stack.go -source=./internal/pkg/describe/stack.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/stack/mocks/mock_stack.go -source=./internal/pkg/describe/stack/stack.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_status.go -source=./internal/pkg/describe/status.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_pipeline_show.go -source=./internal/pkg/describe/pipeline_show.go
${GOBIN}/mockgen -package=mocks -destination=./internal/pkg/describe/mocks/mock_pipeline_status.go -source=./internal/pkg/describe/pipeline_status.go
Expand Down
2 changes: 1 addition & 1 deletion cf-custom-resources/lib/env-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,4 @@ exports.deadlineExpired = function () {
*/
exports.withDefaultResponseURL = function (url) {
defaultResponseURL = url;
};
};
2 changes: 1 addition & 1 deletion internal/pkg/aws/codepipeline/codepipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (c *CodePipeline) GetPipeline(name string) (*Pipeline, error) {
// Example output:
// DeployTo-test Deploy Cloudformation stackname: dinder-test-test
func (s *Stage) HumanString() string {
return fmt.Sprintf(" %s\t%s\t%s\t%s\n", s.Name, s.Category, s.Provider, s.Details)
return fmt.Sprintf("%s\t%s\t%s\t%s\n", s.Name, s.Category, s.Provider, s.Details)
}

// ListPipelineNamesByTags retrieves the names of all pipelines for an application.
Expand Down
3 changes: 2 additions & 1 deletion internal/pkg/cli/env_show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/aws/copilot-cli/internal/pkg/config"
"github.com/aws/copilot-cli/internal/pkg/describe"
"github.com/aws/copilot-cli/internal/pkg/describe/stack"
"github.com/aws/copilot-cli/internal/pkg/term/color"

"testing"
Expand Down Expand Up @@ -229,7 +230,7 @@ func TestEnvShow_Execute(t *testing.T) {
Name: "testSvc3",
Type: "load-balanced",
}
var wantedResources = []*describe.CfnResource{
var wantedResources = []*stack.Resource{
{
Type: "AWS::IAM::Role",
PhysicalID: "testApp-testEnv-CFNExecutionRole",
Expand Down
10 changes: 5 additions & 5 deletions internal/pkg/cli/svc_deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -449,27 +449,27 @@ func (o *deploySvcOpts) showSvcURI() error {
URI(string) (string, error)
}

var svcDescriber identifier
var ecsSvcDescriber identifier
var err error
switch o.targetSvc.Type {
case manifest.LoadBalancedWebServiceType:
svcDescriber, err = describe.NewLBWebServiceDescriber(describe.NewLBWebServiceConfig{
ecsSvcDescriber, err = describe.NewLBWebServiceDescriber(describe.NewLBWebServiceConfig{
NewServiceConfig: describe.NewServiceConfig{
App: o.appName,
Svc: o.name,
ConfigStore: o.store,
},
})
case manifest.RequestDrivenWebServiceType:
svcDescriber, err = describe.NewRDWebServiceDescriber(describe.NewRDWebServiceConfig{
ecsSvcDescriber, err = describe.NewRDWebServiceDescriber(describe.NewRDWebServiceConfig{
NewServiceConfig: describe.NewServiceConfig{
App: o.appName,
Svc: o.name,
ConfigStore: o.store,
},
})
case manifest.BackendServiceType:
svcDescriber, err = describe.NewBackendServiceDescriber(describe.NewBackendServiceConfig{
ecsSvcDescriber, err = describe.NewBackendServiceDescriber(describe.NewBackendServiceConfig{
NewServiceConfig: describe.NewServiceConfig{
App: o.appName,
Svc: o.name,
Expand All @@ -483,7 +483,7 @@ func (o *deploySvcOpts) showSvcURI() error {
return fmt.Errorf("create describer for service type %s: %w", o.targetSvc.Type, err)
}

uri, err := svcDescriber.URI(o.targetEnvironment.Name)
uri, err := ecsSvcDescriber.URI(o.targetEnvironment.Name)
if err != nil {
return fmt.Errorf("get uri for environment %s: %w", o.targetEnvironment.Name, err)
}
Expand Down
14 changes: 7 additions & 7 deletions internal/pkg/cli/svc_exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
type execSvcMocks struct {
storeSvc *mocks.Mockstore
sel *mocks.MockdeploySelector
svcDescriber *mocks.MockserviceDescriber
ecsSvcDescriber *mocks.MockserviceDescriber
ecsCommandExecutor *mocks.MockecsCommandExecutor
ssmPluginManager *mocks.MockssmPluginManager
prompter *mocks.Mockprompter
Expand Down Expand Up @@ -497,7 +497,7 @@ func TestSvcExec_Execute(t *testing.T) {
m.storeSvc.EXPECT().GetEnvironment("mockApp", "mockEnv").Return(&config.Environment{
Name: "my-env",
}, nil),
m.svcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(nil, mockError),
m.ecsSvcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(nil, mockError),
)
},
wantedError: fmt.Errorf("describe ECS service for mockSvc in environment mockEnv: some error"),
Expand All @@ -509,7 +509,7 @@ func TestSvcExec_Execute(t *testing.T) {
m.storeSvc.EXPECT().GetEnvironment("mockApp", "mockEnv").Return(&config.Environment{
Name: "my-env",
}, nil),
m.svcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
m.ecsSvcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
Tasks: []*awsecs.Task{},
}, nil),
)
Expand All @@ -524,7 +524,7 @@ func TestSvcExec_Execute(t *testing.T) {
m.storeSvc.EXPECT().GetEnvironment("mockApp", "mockEnv").Return(&config.Environment{
Name: "my-env",
}, nil),
m.svcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
m.ecsSvcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
Tasks: []*awsecs.Task{
{
TaskArn: aws.String(mockTaskARN),
Expand All @@ -544,7 +544,7 @@ func TestSvcExec_Execute(t *testing.T) {
m.storeSvc.EXPECT().GetEnvironment("mockApp", "mockEnv").Return(&config.Environment{
Name: "my-env",
}, nil),
m.svcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
m.ecsSvcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
ClusterName: "mockCluster",
Tasks: []*awsecs.Task{
{
Expand All @@ -570,7 +570,7 @@ func TestSvcExec_Execute(t *testing.T) {
m.storeSvc.EXPECT().GetEnvironment("mockApp", "mockEnv").Return(&config.Environment{
Name: "my-env",
}, nil),
m.svcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
m.ecsSvcDescriber.EXPECT().DescribeService("mockApp", "mockEnv", "mockSvc").Return(&ecs.ServiceDesc{
ClusterName: "mockCluster",
Tasks: []*awsecs.Task{
{
Expand Down Expand Up @@ -612,7 +612,7 @@ func TestSvcExec_Execute(t *testing.T) {
mocks := execSvcMocks{
storeSvc: mockStoreReader,
ecsCommandExecutor: mockCommandExecutor,
svcDescriber: mockSvcDescriber,
ecsSvcDescriber: mockSvcDescriber,
}

tc.setupMocks(mocks)
Expand Down
1 change: 1 addition & 0 deletions internal/pkg/deploy/cloudformation/stack/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const (
envParamToolsAccountPrincipalKey = "ToolsAccountPrincipalARN"
envParamAppDNSKey = "AppDNSName"
envParamAppDNSDelegationRoleKey = "AppDNSDelegationRole"
EnvParamAliasesKey = "Aliases"

// Output keys.
EnvOutputVPCID = "VpcId"
Expand Down

This file was deleted.

Loading

0 comments on commit c2d143d

Please sign in to comment.