Removes all references to ecs and uses fargate naming

Signed-off-by: Edward Wilde <[email protected]>

Author: ewilde

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@
 ## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
 <!--- If it fixes an open issue, please link to the issue here. -->
-- [ ] I have raised an issue to propose this change ([required](https://github.com/ewilde/faas-ecs/blob/master/CONTRIBUTING.md))
+- [ ] I have raised an issue to propose this change ([required](https://github.com/ewilde/faas-fargate/blob/master/CONTRIBUTING.md))
 
 
 ## How Has This Been Tested?
@@ -27,7 +27,7 @@
 - [ ] My code follows the code style of this project.
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation accordingly.
-- [ ] I've read the [CONTRIBUTION](https://github.com/ewilde/faas-ecs/blob/master/CONTRIBUTING.md) guide
+- [ ] I've read the [CONTRIBUTION](https://github.com/ewilde/faas-fargate/blob/master/CONTRIBUTING.md) guide
 - [ ] I have signed-off my commits with `git commit -s`
 - [ ] I have added tests to cover my changes.
 - [ ] All new and existing tests passed.

.goreleaser.yml

@@ -1,5 +1,5 @@
 builds:
-  - binary: faas-ecs
+  - binary: faas-fargate
     goos:
       - linux
     goarch:

.travis.yml

@@ -17,10 +17,10 @@ before_script:
 
 after_success:
 - if [ ! -z "$TRAVIS_TAG" ] ; then
-  docker tag ewilde/faas-ecs:latest ewilde/faas-ecs:$TRAVIS_TAG;
+  docker tag ewilde/faas-fargate:latest ewilde/faas-fargate:$TRAVIS_TAG;
   echo $DOCKER_PASSWORD | docker login -u=$DOCKER_USERNAME --password-stdin;
-  docker push $DOCKER_NS/faas-ecs:$TRAVIS_TAG;
-  docker push $DOCKER_NS/faas-ecs:latest;
+  docker push $DOCKER_NS/faas-fargate:$TRAVIS_TAG;
+  docker push $DOCKER_NS/faas-fargate:latest;
   fi
 script:
   - make build

CONTRIBUTING.md

@@ -8,16 +8,16 @@ Guidelines for contributing.
 
 We have a number of areas where we can accept contributions:
 
-* Work on [missing features and bugs](https://github.com/ewilde/faas-ecs/issues)
+* Work on [missing features and bugs](https://github.com/ewilde/faas-fargate/issues)
 
 
 ### I've found a typo
 
-* A Pull Request is not necessary. Raise an [Issue](https://github.com/ewilde/faas-ecs/issues) and we'll fix it as soon as we can. 
+* A Pull Request is not necessary. Raise an [Issue](https://github.com/ewilde/faas-fargate/issues) and we'll fix it as soon as we can. 
 
 ### I have a (great) idea
 
-The maintainers would like to make faas-ecs the best it can be and welcome new contributions that align with the project's goals.
+The maintainers would like to make faas-fargate the best it can be and welcome new contributions that align with the project's goals.
 Our time is limited so we'd like to make sure we agree on the proposed work before you spend time doing it.
 Saying "no" is hard which is why we'd rather say "yes" ahead of time. You need to raise a proposal.
 
@@ -65,7 +65,7 @@ Here's an example:
 ```
 Add secrets to provider
 
-We need to have the ability to pass secrets to faas-ecs securely.
+We need to have the ability to pass secrets to faas-fargate securely.
 This commits adds secrets support using  AWS Secrets Manager API.
 
 Resolves #1

Dockerfile

@@ -3,9 +3,9 @@ FROM golang:1.10.2-alpine3.7
 RUN apk --no-cache add git curl
 RUN go get golang.org/x/tools/cmd/goimports
 
-RUN mkdir -p /go/src/github.com/ewilde/faas-ecs/
+RUN mkdir -p /go/src/github.com/ewilde/faas-fargate/
 
-WORKDIR /go/src/github.com/ewilde/faas-ecs
+WORKDIR /go/src/github.com/ewilde/faas-fargate
 
 COPY . .
 
@@ -17,10 +17,10 @@ RUN goimports -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
     && GIT_COMMIT_SHA=$(git rev-list -1 HEAD) \
     && GIT_COMMIT_MESSAGE=$(git log -1 --pretty=%B 2>&1 | head -n 1) \
     && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
-        -X github.com/ewilde/faas-ecs/version.GitCommitSHA=${GIT_COMMIT_SHA}\
-        -X \"github.com/ewilde/faas-ecs/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\
-        -X github.com/ewilde/faas-ecs/version.Version=${VERSION}" \
-        -a -installsuffix cgo -o faas-ecs .
+        -X github.com/ewilde/faas-fargate/version.GitCommitSHA=${GIT_COMMIT_SHA}\
+        -X \"github.com/ewilde/faas-fargate/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\
+        -X github.com/ewilde/faas-fargate/version.Version=${VERSION}" \
+        -a -installsuffix cgo -o faas-fargate .
 
 FROM alpine:3.7
 
@@ -35,9 +35,9 @@ EXPOSE 8080
 ENV http_proxy      ""
 ENV https_proxy     ""
 
-COPY --from=0 /go/src/github.com/ewilde/faas-ecs/faas-ecs .
+COPY --from=0 /go/src/github.com/ewilde/faas-fargate/faas-fargate .
 RUN chown -R app:app ./
 
 USER app
 
-CMD ["./faas-ecs"]
+CMD ["./faas-fargate"]

Makefile

@@ -15,7 +15,7 @@ local-build: goimportscheck vet
 	@echo "Build succeeded"
 
 build:
-	docker build -t ewilde/faas-ecs:$(TAG) . --squash=${SQUASH}
+	docker build -t ewilde/faas-fargate:$(TAG) . --squash=${SQUASH}
 
 release:
 	go get github.com/goreleaser/goreleaser; \
@@ -40,8 +40,8 @@ vet:
 	fi
 
 lint:
-	@echo "go lint ."
-	@golint $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
+	@echo "golint ."
+	@golint -set_exit_status $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
 		echo ""; \
 		echo "Lint found errors in the source code. Please check the reported errors"; \
 		echo "and fix them if necessary before submitting the code for review."; \

README.md

@@ -1,11 +1,11 @@
 <p align="center">
   <img alt="Mascot" src="docs/mascot.png" />
-  <h3 align="center">faas-ecs</h3>
+  <h3 align="center">faas-fargate</h3>
   <p align="center">Run OpenFaaS on AWS serverless with Fargate.</p>
   <p align="center">
-    <a href="https://github.com/goreleaser/goreleaser/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/ewilde/faas-ecs.svg?style=flat-square"></a>
+    <a href="https://github.com/goreleaser/goreleaser/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/ewilde/faas-fargate.svg?style=flat-square"></a>
     <a href="/LICENSE.md"><img alt="Software License" src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
-    <a href="https://travis-ci.org/ewilde/faas-ecs"><img alt="Travis" src="https://img.shields.io/travis/ewilde/faas-ecs/master.svg?style=flat-square"></a>
+    <a href="https://travis-ci.org/ewilde/faas-fargate"><img alt="Travis" src="https://img.shields.io/travis/ewilde/faas-fargate/master.svg?style=flat-square"></a>
     <a href="https://github.com/goreleaser"><img alt="Powered By: GoReleaser" src="https://img.shields.io/badge/powered%20by-goreleaser-green.svg?style=flat-square"></a>   
   </p>
 </p>
@@ -14,22 +14,22 @@
 
 ## Installation
 ### Terraform deployment
-_**Easy to get started**_: A [terraform module](https://github.com/ewilde/terraform-aws-openfaas-ecs) has been developed 
-to build out a standard deployment of `faas-ecs` on `fargate`. See: https://github.com/ewilde/terraform-aws-openfaas-ecs.
+_**Easy to get started**_: A [terraform module](https://github.com/ewilde/terraform-aws-openfaas-fargate) has been developed 
+to build out a standard deployment of `faas-fargate` on `fargate`. See: https://github.com/ewilde/terraform-aws-openfaas-fargate.
 This module deploys the whole stack on Fargate including openfaas `gateway`, `nats` and sets up default security setting
 etc...
 
 ### Manually
-1. Use the [published docker image](https://hub.docker.com/r/ewilde/faas-ecs/)
-2. Download from the [releases tab](https://github.com/ewilde/faas-ecs/releases)
+1. Use the [published docker image](https://hub.docker.com/r/ewilde/faas-fargate/)
+2. Download from the [releases tab](https://github.com/ewilde/faas-fargate/releases)
 
 ## Configuration
 All configuration is managed using environment variables
 
 | Option                            | Usage                                                                                          | Default                  | Required |
 |-----------------------------------|------------------------------------------------------------------------------------------------|--------------------------|----------|
 | `subnet_ids`                      | Comma separated list of subnet ids used to place function                                      | subnets from default vpc |   no     |
-| `security_group_id`               | Id of the security group to assign functions. If using [terraform-aws-openfaas-ecs](https://github.com/ewilde/terraform-aws-openfaas-ecs) this is the output variable `service_security_group`                                                  |                          |   no       |
+| `security_group_id`               | Id of the security group to assign functions. If using [terraform-aws-openfaas-fargate](https://github.com/ewilde/terraform-aws-openfaas-fargate) this is the output variable `service_security_group`                                                  |                          |   no       |
 | `cluster_name`                    | Name of the AWS ECS cluster.                                                                   | `openfaas`               |   no     |
 | `assign_public_ip`                | Whether or not to associate a public ip address with your function.                            | `DISABLED`               |   no     |
 | `enable_function_readiness_probe` | Boolean - enable a readiness probe to test functions.                                          | `true`                   |   no     |
@@ -57,5 +57,5 @@ git push origin v0.5.7
 Travis will:
 1. build the release
 1. run tests
-1. push to [docker](https://hub.docker.com/r/ewilde/faas-ecs/)
-1. create a github release on the [releases tab](https://github.com/ewilde/faas-ecs/releases)
+1. push to [docker](https://hub.docker.com/r/ewilde/faas-fargate/)
+1. create a github release on the [releases tab](https://github.com/ewilde/faas-fargate/releases)

aws/api.go

@@ -2,6 +2,7 @@ package aws
 
 import "github.com/aws/aws-sdk-go/service/ecs"
 
+// KeyValuePairGetValue searches the array of values and returns the matching name or nil if none are found.
 func KeyValuePairGetValue(name string, values []*ecs.KeyValuePair) (*string, bool) {
 	for _, item := range values {
 		if *item.Name == name {

aws/autonaming.go

@@ -3,32 +3,34 @@ package aws
 import (
 	"sync"
 
-	"github.com/aws/aws-sdk-go/service/servicediscovery"
-	log "github.com/sirupsen/logrus"
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/satori/go.uuid"
 	"errors"
 	"fmt"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/servicediscovery"
+	"github.com/satori/go.uuid"
+	log "github.com/sirupsen/logrus"
 )
 
 const namespace = "openfaas.local"
+
 var once = &sync.Once{}
-var namespaceId *string
+var namespaceID *string
 
-func ensureServiceRegistrationExists(discovery *servicediscovery.ServiceDiscovery, serviceName string, vpcId string) (string, error) {
+func ensureServiceRegistrationExists(discovery *servicediscovery.ServiceDiscovery, serviceName string, vpcID string) (string, error) {
 
-	namespaceId, err := ensureDnsNamespaceExists(discovery, vpcId)
+	namespaceID, err := ensureDNSNamespaceExists(discovery, vpcID)
 	if err != nil {
 		log.Errorln("error ensuring dns namespace existing. ", err)
 		return "", err
 	}
 
 	listResults, err := discovery.ListServices(&servicediscovery.ListServicesInput{
-		Filters:[]*servicediscovery.ServiceFilter {
+		Filters: []*servicediscovery.ServiceFilter{
 			{
 				Name: aws.String("NAMESPACE_ID"),
 				Values: []*string{
-					namespaceId,
+					namespaceID,
 				},
 			},
 		},
@@ -48,21 +50,21 @@ func ensureServiceRegistrationExists(discovery *servicediscovery.ServiceDiscover
 	}
 
 	if serviceArn == "" {
-		requestId := uuid.NewV4()
+		requestID := uuid.NewV4()
 		createResult, err := discovery.CreateService(&servicediscovery.CreateServiceInput{
-			Name: aws.String(serviceName),
-			CreatorRequestId: aws.String(requestId.String()),
-			Description: aws.String(fmt.Sprintf("Openfaas auto-naming service for %s", serviceName)),
-			DnsConfig: &servicediscovery.DnsConfig {
-				NamespaceId: namespaceId,
+			Name:             aws.String(serviceName),
+			CreatorRequestId: aws.String(requestID.String()),
+			Description:      aws.String(fmt.Sprintf("Openfaas auto-naming service for %s", serviceName)),
+			DnsConfig: &servicediscovery.DnsConfig{
+				NamespaceId: namespaceID,
 				DnsRecords: []*servicediscovery.DnsRecord{
 					{
 						Type: aws.String("A"),
-						TTL: aws.Int64(10),
+						TTL:  aws.Int64(10),
 					},
 				},
 			},
-			HealthCheckCustomConfig: &servicediscovery.HealthCheckCustomConfig {
+			HealthCheckCustomConfig: &servicediscovery.HealthCheckCustomConfig{
 				FailureThreshold: aws.Int64(1),
 			},
 		})
@@ -78,7 +80,7 @@ func ensureServiceRegistrationExists(discovery *servicediscovery.ServiceDiscover
 	return serviceArn, nil
 }
 
-func ensureDnsNamespaceExists(discovery *servicediscovery.ServiceDiscovery, vpcId string)  (id *string, err error)  {
+func ensureDNSNamespaceExists(discovery *servicediscovery.ServiceDiscovery, vpcID string) (id *string, err error) {
 	once.Do(func() {
 		var found bool
 
@@ -89,12 +91,12 @@ func ensureDnsNamespaceExists(discovery *servicediscovery.ServiceDiscovery, vpcI
 		}
 
 		if !found {
-			requestId := uuid.NewV4()
-			_ , err = discovery.CreatePrivateDnsNamespace(&servicediscovery.CreatePrivateDnsNamespaceInput{
-				Name: aws.String(namespace),
-				CreatorRequestId: aws.String(requestId.String()),
-				Description: aws.String("Openfaas private DNS namespace"),
-				Vpc: aws.String(vpcId),
+			requestID := uuid.NewV4()
+			_, err = discovery.CreatePrivateDnsNamespace(&servicediscovery.CreatePrivateDnsNamespaceInput{
+				Name:             aws.String(namespace),
+				CreatorRequestId: aws.String(requestID.String()),
+				Description:      aws.String("Openfaas private DNS namespace"),
+				Vpc:              aws.String(vpcID),
 			})
 
 			if err != nil {
@@ -114,10 +116,10 @@ func ensureDnsNamespaceExists(discovery *servicediscovery.ServiceDiscovery, vpcI
 			}
 		}
 
-		namespaceId = id
+		namespaceID = id
 	})
 
-	return namespaceId, err
+	return namespaceID, err
 }
 
 func findNamespace(discovery *servicediscovery.ServiceDiscovery) (*string, bool, error) {
@@ -130,7 +132,7 @@ func findNamespace(discovery *servicediscovery.ServiceDiscovery) (*string, bool,
 
 	found := false
 	var id *string
-	for _, item := range listResult.Namespaces  {
+	for _, item := range listResult.Namespaces {
 		if aws.StringValue(item.Name) == namespace {
 			id = item.Id
 			found = true