Skip to content
This repository was archived by the owner on Nov 7, 2019. It is now read-only.

WIP: Golang templating #129

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
63 changes: 62 additions & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tag:

.PHONY: install-aws-codegen
install-aws-codegen:
go install -ldflags "-X main.commit=$(commitSHA) -X main.date=$(dateStr)" ./code-generation/cmd/aws-service-operator-codegen
${MAKE} -C code-generation install

.PHONY: aws-codegen
aws-codegen:
Expand Down
4 changes: 4 additions & 0 deletions code-generation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ dateStr := $(shell date +%s)
build:
go build -ldflags "-X main.commit=$(commitSHA) -X main.date=$(dateStr)" ./cmd/aws-service-operator-codegen

.PHONY: install
install: rebuild
go install -ldflags "-X main.commit=$(commitSHA) -X main.date=$(dateStr)" ./cmd/aws-service-operator-codegen

.PHONY: install-bindata
install-bindata:
go get -u github.com/jteeuwen/go-bindata/...
Expand Down
10 changes: 8 additions & 2 deletions code-generation/pkg/codegen/assets/cft.go.templ
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package {{.Spec.Resource.Name}}

import (
"errors"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
Expand Down Expand Up @@ -66,11 +67,16 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput
sess := s.config.AWSSession
svc := cloudformation.New(sess)

cftemplate := helpers.GetCloudFormationTemplate(s.config, "{{.Spec.Resource.Name}}", s.{{.Spec.Kind}}.{{.Spec.Type}}.CloudFormationTemplateName, s.{{.Spec.Kind}}.{{.Spec.Type}}.CloudFormationTemplateNamespace)
cftemplateURL := helpers.GetCloudFormationTemplate(s.config, "{{.Spec.Resource.Name}}", s.{{.Spec.Kind}}.{{.Spec.Type}}.CloudFormationTemplateName, s.{{.Spec.Kind}}.{{.Spec.Type}}.CloudFormationTemplateNamespace)

cftemplate, err := helpers.FetchAndProcessTemplate(cftemplateURL, s.{{$.Spec.Kind}})
if err != nil {
return output, err
}

stackInputs := cloudformation.CreateStackInput{
StackName: aws.String(s.StackName()),
TemplateURL: aws.String(cftemplate),
TemplateBody: cftemplate,
NotificationARNs: []*string{
aws.String(s.topicARN),
},
Expand Down
16 changes: 8 additions & 8 deletions code-generation/pkg/codegen/templates.go

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion configs/aws-service-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,15 @@ items:
- pods
- configmaps
- services
- events
verbs:
- get
- list
- watch
- create
- delete
- update
- patch
- apiGroups:
- apiextensions.k8s.io
resources:
Expand Down Expand Up @@ -203,7 +205,7 @@ items:
template:
metadata:
annotations:
iam.amazonaws.com/role: arn:aws:iam::<ACCOUNT_ID>:role/aws-service-operator
iam.amazonaws.com/role: aws-service-operator
labels:
app: aws-service-operator
spec:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions pkg/client/clientset/versioned/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions pkg/client/clientset/versioned/fake/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions pkg/client/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions pkg/client/clientset/versioned/scheme/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions pkg/client/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading