Skip to content

Commit a566a9b

Browse files
tjholmtjholm
authored
Merge pull request #107 from asalkeld/fix-99
fix: Remove membrane childCommand and update all modules
2 parents f5bc739 + a66f3bd commit a566a9b

File tree

13 files changed

+396
-120
lines changed

13 files changed

+396
-120
lines changed

‎Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ generate_check: generate fmt
5151

5252
.PHONY: check
5353
check: lint test generate_check
54+
55+
.PHONY: go-mod-update
56+
go-mod-update:
57+
go get -u $$(go run ./hack/allmods)
58+
go mod tidy

‎go.mod

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,62 @@ module github.com/nitrictech/cli
33
go 1.16
44

55
require (
6+
cloud.google.com/go/compute v1.5.0 // indirect
7+
cloud.google.com/go/iam v0.2.0 // indirect
68
github.com/AlecAivazis/survey/v2 v2.3.2
7-
github.com/Azure/azure-sdk-for-go v56.3.0+incompatible
9+
github.com/Azure/azure-sdk-for-go v61.6.0+incompatible
810
github.com/Azure/go-autorest/autorest/to v0.4.0
911
github.com/Microsoft/go-winio v0.5.0 // indirect
12+
github.com/aws/aws-sdk-go v1.43.7 // indirect
1013
github.com/davecgh/go-spew v1.1.1
1114
github.com/docker/cli v20.10.12+incompatible
12-
github.com/docker/docker v20.10.11+incompatible
15+
github.com/docker/docker v20.10.12+incompatible
1316
github.com/docker/go-connections v0.4.0
14-
github.com/fasthttp/router v1.4.5
17+
github.com/envoyproxy/protoc-gen-validate v0.6.3 // indirect
18+
github.com/fasthttp/router v1.4.6
1519
github.com/fatih/color v1.13.0
16-
github.com/getkin/kin-openapi v0.88.0
20+
github.com/getkin/kin-openapi v0.90.0
1721
github.com/go-openapi/strfmt v0.21.1 // indirect
1822
github.com/golang/mock v1.6.0
19-
github.com/golangci/golangci-lint v1.43.0
20-
github.com/google/go-cmp v0.5.6
21-
github.com/hashicorp/consul/sdk v0.8.0
23+
github.com/golangci/golangci-lint v1.44.2
24+
github.com/google/go-cmp v0.5.7
25+
github.com/hashicorp/consul/sdk v0.9.0
2226
github.com/hashicorp/go-getter v1.5.11
2327
github.com/imdario/mergo v0.3.12
2428
github.com/jedib0t/go-pretty v4.3.0+incompatible
25-
github.com/mitchellh/mapstructure v1.4.2
29+
github.com/klauspost/compress v1.14.4 // indirect
30+
github.com/magiconair/properties v1.8.6 // indirect
31+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
32+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
33+
github.com/mitchellh/mapstructure v1.4.3
2634
github.com/moby/buildkit v0.9.3 // indirect
2735
github.com/moby/moby v20.10.12+incompatible
2836
github.com/nitrictech/boxygen v0.0.1-rc.7.0.20211212231606-62c668408f91
29-
github.com/nitrictech/nitric v0.14.0-rc.4
37+
github.com/nitrictech/nitric v0.14.0-rc.7
3038
github.com/pkg/errors v0.9.1
31-
github.com/pterm/pterm v0.12.34
32-
github.com/pulumi/pulumi-aws/sdk/v4 v4.33.0
33-
github.com/pulumi/pulumi-azure-native/sdk v1.56.0
34-
github.com/pulumi/pulumi-azure/sdk/v4 v4.36.0
35-
github.com/pulumi/pulumi-azuread/sdk/v5 v5.16.0
39+
github.com/pterm/pterm v0.12.37
40+
github.com/pulumi/pulumi-aws/sdk/v4 v4.37.5
41+
github.com/pulumi/pulumi-azure-native/sdk v1.60.0
42+
github.com/pulumi/pulumi-azure/sdk/v4 v4.39.0
43+
github.com/pulumi/pulumi-azuread/sdk/v5 v5.17.0
3644
github.com/pulumi/pulumi-docker/sdk/v3 v3.1.0
37-
github.com/pulumi/pulumi/sdk/v3 v3.23.2
45+
github.com/pulumi/pulumi/sdk/v3 v3.25.0
3846
github.com/robfig/cron/v3 v3.0.1
47+
github.com/savsgio/gotils v0.0.0-20220201163454-d252f0a44d5b // indirect
48+
github.com/spf13/afero v1.8.1 // indirect
3949
github.com/spf13/cast v1.4.1
40-
github.com/spf13/cobra v1.2.1
41-
github.com/spf13/viper v1.9.0
50+
github.com/spf13/cobra v1.3.0
51+
github.com/spf13/viper v1.10.1
52+
github.com/stretchr/objx v0.3.0 // indirect
4253
github.com/stretchr/testify v1.7.0
43-
github.com/valyala/fasthttp v1.32.0
44-
golang.org/x/net v0.0.0-20211105192438-b53810dc28af // indirect
45-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
46-
google.golang.org/grpc v1.41.0
54+
github.com/ulikunitz/xz v0.5.10 // indirect
55+
github.com/valyala/fasthttp v1.33.0
56+
golang.org/x/mod v0.5.1
57+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
58+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
59+
golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 // indirect
60+
google.golang.org/grpc v1.44.0
61+
gopkg.in/ini.v1 v1.66.4 // indirect
4762
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
4863
gopkg.in/yaml.v2 v2.4.0
4964
)

‎go.sum

Lines changed: 294 additions & 88 deletions
Large diffs are not rendered by default.

‎hack/allmods/main.go

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Copyright Nitric Pty Ltd.
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
//
5+
// Licensed under the Apache License, Version 2.0 (the "License");
6+
// you may not use this file except in compliance with the License.
7+
// You may obtain a copy of the License at:
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing, software
12+
// distributed under the License is distributed on an "AS IS" BASIS,
13+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// See the License for the specific language governing permissions and
15+
// limitations under the License.
16+
17+
package main
18+
19+
import (
20+
"fmt"
21+
"os"
22+
"strings"
23+
24+
"github.com/golangci/golangci-lint/pkg/sliceutil"
25+
"golang.org/x/mod/modfile"
26+
)
27+
28+
var ignoreList = []string{"github.com/jedib0t/go-pretty"}
29+
30+
func main() {
31+
b, err := os.ReadFile("go.mod")
32+
if err != nil {
33+
panic(err)
34+
}
35+
36+
mf, err := modfile.Parse("go.mod", b, nil)
37+
if err != nil {
38+
panic(err)
39+
}
40+
mods := []string{}
41+
for _, r := range mf.Require {
42+
if sliceutil.Contains(ignoreList, r.Mod.Path) {
43+
continue
44+
}
45+
if r.Indirect {
46+
continue // only update directly required modules
47+
}
48+
mods = append(mods, r.Mod.Path)
49+
}
50+
fmt.Print(strings.Join(mods, " "))
51+
}

‎pkg/provider/pulumi/aws/aws_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func TestValidate(t *testing.T) {
274274

275275
func Test_awsProvider_Plugins(t *testing.T) {
276276
want := []common.Plugin{
277-
{Name: "aws", Version: "v4.33.0"},
277+
{Name: "aws", Version: "v4.37.5"},
278278
}
279279
got := (&awsProvider{}).Plugins()
280280
if !reflect.DeepEqual(got, want) {

‎pkg/provider/pulumi/aws/pulumi-aws-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v4.33.0
1+
v4.37.5

‎pkg/provider/pulumi/azure/azure_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525

2626
func Test_azureProvider_Plugins(t *testing.T) {
2727
want := []common.Plugin{
28-
{Name: "azure-native", Version: "v1.56.0"},
29-
{Name: "azure", Version: "v4.36.0"},
30-
{Name: "azuread", Version: "v5.16.0"},
28+
{Name: "azure-native", Version: "v1.60.0"},
29+
{Name: "azure", Version: "v4.39.0"},
30+
{Name: "azuread", Version: "v5.17.0"},
3131
}
3232
got := (&azureProvider{}).Plugins()
3333
if !reflect.DeepEqual(got, want) {

‎pkg/provider/pulumi/azure/pulumi-azure-native-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.56.0
1+
v1.60.0

‎pkg/provider/pulumi/azure/pulumi-azure-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v4.36.0
1+
v4.39.0

‎pkg/provider/pulumi/azure/pulumi-azuread-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v5.16.0
1+
v5.17.0

‎pkg/run/run.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ func (l *localServices) Start(pool worker.WorkerPool) error {
145145
// running functions will connect to
146146
l.mem, err = membrane.New(&membrane.MembraneOptions{
147147
ServiceAddress: "0.0.0.0:50051",
148-
ChildCommand: []string{"echo", "running membrane 🚀"},
149148
SecretPlugin: secp,
150149
QueuePlugin: qp,
151150
StoragePlugin: sp,

‎pkg/stack/function_helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestFunctionVersionString(t *testing.T) {
2929
}{
3030
{
3131
name: "from embed",
32-
want: "v0.13.0-rc.17",
32+
want: "v0.14.0-rc.7",
3333
},
3434
}
3535
for _, tt := range tests {

‎pkg/stack/membraneversion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.13.0-rc.17
1+
v0.14.0-rc.7

0 commit comments

Comments
 (0)