Skip to content

Commit 4dd1a95

Browse files
authored
Merge pull request #303 from nitrictech/develop
Release
2 parents 4013119 + 7215c85 commit 4dd1a95

35 files changed

+531
-259
lines changed

.github/workflows/assign-issues.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Auto Assign to Project(s)
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
pull_request:
7+
types: [opened]
8+
env:
9+
MY_GITHUB_TOKEN: ${{ secrets.NITRIC_BOT_TOKEN }}
10+
11+
jobs:
12+
assign_one_project:
13+
runs-on: ubuntu-latest
14+
name: Assign to One Project
15+
steps:
16+
- name: Assign NEW issues and NEW pull requests to project Nitric
17+
uses: srggrs/[email protected]
18+
if: github.event.action == 'opened'
19+
with:
20+
project: 'https://github.com/orgs/nitrictech/projects/3'

.github/workflows/aws-e2e.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ jobs:
4040
make build
4141
mv bin/nitric $(go env GOPATH)/bin/nitric
4242
43-
- name: Configure AWS credentials
44-
uses: aws-actions/configure-aws-credentials@v1
43+
- name: install-aws-cli
44+
uses: unfor19/install-aws-cli-action@v1.0.3
4545
with:
46-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
47-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
48-
aws-region: ${{ env.AWS_REGION }}
46+
arch: amd64
4947

5048
- name: Nitric UP
49+
env:
50+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
51+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5152
run: |
5253
cd ${{ github.workspace }}/test-app
5354
nitric up -s aws --ci
@@ -80,13 +81,10 @@ jobs:
8081
mv bin/nitric $(go env GOPATH)/bin/nitric
8182
fi
8283
83-
- name: Configure AWS credentials
84-
uses: aws-actions/configure-aws-credentials@v1
85-
with:
86-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
87-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
88-
aws-region: ${{ env.AWS_REGION }}
8984
- name: Nitric Down
85+
env:
86+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
87+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
9088
run: |
9189
cd ${{ github.workspace }}/test-app
9290
nitric down -s aws --ci -y

.github/workflows/publish-image.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- 'develop'
7+
- 'main'
78

89
jobs:
910
push_to_registry:

go.mod

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ require (
1010
github.com/docker/cli v20.10.17+incompatible
1111
github.com/docker/docker v20.10.17+incompatible
1212
github.com/docker/go-connections v0.4.0
13-
github.com/fasthttp/router v1.4.10
14-
github.com/getkin/kin-openapi v0.97.0
13+
github.com/fasthttp/router v1.4.11
14+
github.com/getkin/kin-openapi v0.98.0
1515
github.com/golang/mock v1.6.0
1616
github.com/golangci/golangci-lint v1.46.2
1717
github.com/google/go-cmp v0.5.8
18-
github.com/hashicorp/consul/sdk v0.10.0
18+
github.com/hashicorp/consul/sdk v0.11.0
1919
github.com/hashicorp/go-getter v1.6.2
2020
github.com/hashicorp/go-version v1.6.0
2121
github.com/imdario/mergo v0.3.13
@@ -26,15 +26,15 @@ require (
2626
github.com/nitrictech/boxygen v0.0.1-rc.9
2727
github.com/nitrictech/nitric v0.17.0
2828
github.com/pkg/errors v0.9.1
29-
github.com/pterm/pterm v0.12.44
29+
github.com/pterm/pterm v0.12.45
3030
github.com/pulumi/pulumi-aws/sdk/v4 v4.38.1
3131
github.com/pulumi/pulumi-azure-native/sdk v1.67.0
3232
github.com/pulumi/pulumi-azure/sdk/v4 v4.42.0
3333
github.com/pulumi/pulumi-azuread/sdk/v5 v5.26.1
34-
github.com/pulumi/pulumi-docker/sdk/v3 v3.2.0
34+
github.com/pulumi/pulumi-docker/sdk/v3 v3.4.0
3535
github.com/pulumi/pulumi-gcp/sdk/v6 v6.32.0
36-
github.com/pulumi/pulumi-random/sdk/v4 v4.8.0
37-
github.com/pulumi/pulumi/sdk/v3 v3.36.0
36+
github.com/pulumi/pulumi-random/sdk/v4 v4.8.1
37+
github.com/pulumi/pulumi/sdk/v3 v3.37.2
3838
github.com/robfig/cron/v3 v3.0.1
3939
github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect
4040
github.com/segmentio/encoding v0.3.5
@@ -44,24 +44,20 @@ require (
4444
github.com/valyala/fasthttp v1.38.0
4545
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
4646
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
47-
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c
47+
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7
4848
google.golang.org/grpc v1.48.0
4949
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
5050
gopkg.in/yaml.v2 v2.4.0
5151
)
5252

53-
require (
54-
cloud.google.com/go/storage v1.24.0
55-
github.com/aws/aws-sdk-go v1.44.61
56-
)
57-
5853
require (
5954
4d63.com/gochecknoglobals v0.1.0 // indirect
6055
atomicgo.dev/cursor v0.1.1 // indirect
6156
atomicgo.dev/keyboard v0.2.8 // indirect
6257
cloud.google.com/go v0.103.0 // indirect
63-
cloud.google.com/go/compute v1.7.0 // indirect
58+
cloud.google.com/go/compute v1.8.0 // indirect
6459
cloud.google.com/go/iam v0.3.0 // indirect
60+
cloud.google.com/go/storage v1.25.0 // indirect
6561
github.com/Antonboom/errname v0.1.6 // indirect
6662
github.com/Antonboom/nilnil v0.1.1 // indirect
6763
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -87,6 +83,7 @@ require (
8783
github.com/asdine/storm v2.1.2+incompatible // indirect
8884
github.com/ashanbrown/forbidigo v1.3.0 // indirect
8985
github.com/ashanbrown/makezero v1.1.1 // indirect
86+
github.com/aws/aws-sdk-go v1.44.76 // indirect
9087
github.com/beorn7/perks v1.0.1 // indirect
9188
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
9289
github.com/bkielbasa/cyclop v1.2.0 // indirect
@@ -150,7 +147,7 @@ require (
150147
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
151148
github.com/google/uuid v1.3.0 // indirect
152149
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
153-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
150+
github.com/googleapis/gax-go/v2 v2.5.1 // indirect
154151
github.com/gookit/color v1.5.1 // indirect
155152
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
156153
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
@@ -164,7 +161,7 @@ require (
164161
github.com/hashicorp/go-safetemp v1.0.0 // indirect
165162
github.com/hashicorp/hcl v1.0.0 // indirect
166163
github.com/hexops/gotextdiff v1.0.3 // indirect
167-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
164+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
168165
github.com/invopop/yaml v0.1.0 // indirect
169166
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
170167
github.com/jgautheron/goconst v1.5.1 // indirect
@@ -189,8 +186,8 @@ require (
189186
github.com/mailru/easyjson v0.7.0 // indirect
190187
github.com/maratori/testpackage v1.0.1 // indirect
191188
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
192-
github.com/mattn/go-colorable v0.1.12 // indirect
193-
github.com/mattn/go-isatty v0.0.14 // indirect
189+
github.com/mattn/go-colorable v0.1.13 // indirect
190+
github.com/mattn/go-isatty v0.0.16 // indirect
194191
github.com/mattn/go-runewidth v0.0.13 // indirect
195192
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
196193
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
@@ -234,7 +231,7 @@ require (
234231
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
235232
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
236233
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
237-
github.com/rivo/uniseg v0.2.0 // indirect
234+
github.com/rivo/uniseg v0.3.4 // indirect
238235
github.com/rogpeppe/go-internal v1.8.1 // indirect
239236
github.com/ryancurrah/gomodguard v1.2.3 // indirect
240237
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
@@ -284,18 +281,18 @@ require (
284281
go.uber.org/atomic v1.7.0 // indirect
285282
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
286283
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
287-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
284+
golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
288285
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
289-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
286+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
290287
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
291288
golang.org/x/text v0.3.7 // indirect
292289
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
293290
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
294291
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
295-
google.golang.org/api v0.88.0 // indirect
292+
google.golang.org/api v0.92.0 // indirect
296293
google.golang.org/appengine v1.6.7 // indirect
297-
google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252 // indirect
298-
google.golang.org/protobuf v1.28.0 // indirect
294+
google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
295+
google.golang.org/protobuf v1.28.1 // indirect
299296
gopkg.in/ini.v1 v1.66.4 // indirect
300297
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
301298
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect

0 commit comments

Comments
 (0)