Skip to content

Commit

Permalink
Merge pull request #107 from asalkeld/fix-99
Browse files Browse the repository at this point in the history
fix: Remove membrane childCommand and update all modules
  • Loading branch information
tjholm authored Feb 28, 2022
2 parents f5bc739 + a66f3bd commit a566a9b
Show file tree
Hide file tree
Showing 13 changed files with 396 additions and 120 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,8 @@ generate_check: generate fmt

.PHONY: check
check: lint test generate_check

.PHONY: go-mod-update
go-mod-update:
go get -u $$(go run ./hack/allmods)
go mod tidy
57 changes: 36 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,62 @@ module github.com/nitrictech/cli
go 1.16

require (
cloud.google.com/go/compute v1.5.0 // indirect
cloud.google.com/go/iam v0.2.0 // indirect
github.com/AlecAivazis/survey/v2 v2.3.2
github.com/Azure/azure-sdk-for-go v56.3.0+incompatible
github.com/Azure/azure-sdk-for-go v61.6.0+incompatible
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/aws/aws-sdk-go v1.43.7 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/docker/cli v20.10.12+incompatible
github.com/docker/docker v20.10.11+incompatible
github.com/docker/docker v20.10.12+incompatible
github.com/docker/go-connections v0.4.0
github.com/fasthttp/router v1.4.5
github.com/envoyproxy/protoc-gen-validate v0.6.3 // indirect
github.com/fasthttp/router v1.4.6
github.com/fatih/color v1.13.0
github.com/getkin/kin-openapi v0.88.0
github.com/getkin/kin-openapi v0.90.0
github.com/go-openapi/strfmt v0.21.1 // indirect
github.com/golang/mock v1.6.0
github.com/golangci/golangci-lint v1.43.0
github.com/google/go-cmp v0.5.6
github.com/hashicorp/consul/sdk v0.8.0
github.com/golangci/golangci-lint v1.44.2
github.com/google/go-cmp v0.5.7
github.com/hashicorp/consul/sdk v0.9.0
github.com/hashicorp/go-getter v1.5.11
github.com/imdario/mergo v0.3.12
github.com/jedib0t/go-pretty v4.3.0+incompatible
github.com/mitchellh/mapstructure v1.4.2
github.com/klauspost/compress v1.14.4 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.4.3
github.com/moby/buildkit v0.9.3 // indirect
github.com/moby/moby v20.10.12+incompatible
github.com/nitrictech/boxygen v0.0.1-rc.7.0.20211212231606-62c668408f91
github.com/nitrictech/nitric v0.14.0-rc.4
github.com/nitrictech/nitric v0.14.0-rc.7
github.com/pkg/errors v0.9.1
github.com/pterm/pterm v0.12.34
github.com/pulumi/pulumi-aws/sdk/v4 v4.33.0
github.com/pulumi/pulumi-azure-native/sdk v1.56.0
github.com/pulumi/pulumi-azure/sdk/v4 v4.36.0
github.com/pulumi/pulumi-azuread/sdk/v5 v5.16.0
github.com/pterm/pterm v0.12.37
github.com/pulumi/pulumi-aws/sdk/v4 v4.37.5
github.com/pulumi/pulumi-azure-native/sdk v1.60.0
github.com/pulumi/pulumi-azure/sdk/v4 v4.39.0
github.com/pulumi/pulumi-azuread/sdk/v5 v5.17.0
github.com/pulumi/pulumi-docker/sdk/v3 v3.1.0
github.com/pulumi/pulumi/sdk/v3 v3.23.2
github.com/pulumi/pulumi/sdk/v3 v3.25.0
github.com/robfig/cron/v3 v3.0.1
github.com/savsgio/gotils v0.0.0-20220201163454-d252f0a44d5b // indirect
github.com/spf13/afero v1.8.1 // indirect
github.com/spf13/cast v1.4.1
github.com/spf13/cobra v1.2.1
github.com/spf13/viper v1.9.0
github.com/spf13/cobra v1.3.0
github.com/spf13/viper v1.10.1
github.com/stretchr/objx v0.3.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/valyala/fasthttp v1.32.0
golang.org/x/net v0.0.0-20211105192438-b53810dc28af // indirect
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
google.golang.org/grpc v1.41.0
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/valyala/fasthttp v1.33.0
golang.org/x/mod v0.5.1
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 // indirect
google.golang.org/grpc v1.44.0
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
gopkg.in/yaml.v2 v2.4.0
)
Expand Down
382 changes: 294 additions & 88 deletions go.sum

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions hack/allmods/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Copyright Nitric Pty Ltd.
//
// SPDX-License-Identifier: Apache-2.0
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at:
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package main

import (
"fmt"
"os"
"strings"

"github.com/golangci/golangci-lint/pkg/sliceutil"
"golang.org/x/mod/modfile"
)

var ignoreList = []string{"github.com/jedib0t/go-pretty"}

func main() {
b, err := os.ReadFile("go.mod")
if err != nil {
panic(err)
}

mf, err := modfile.Parse("go.mod", b, nil)
if err != nil {
panic(err)
}
mods := []string{}
for _, r := range mf.Require {
if sliceutil.Contains(ignoreList, r.Mod.Path) {
continue
}
if r.Indirect {
continue // only update directly required modules
}
mods = append(mods, r.Mod.Path)
}
fmt.Print(strings.Join(mods, " "))
}
2 changes: 1 addition & 1 deletion pkg/provider/pulumi/aws/aws_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func TestValidate(t *testing.T) {

func Test_awsProvider_Plugins(t *testing.T) {
want := []common.Plugin{
{Name: "aws", Version: "v4.33.0"},
{Name: "aws", Version: "v4.37.5"},
}
got := (&awsProvider{}).Plugins()
if !reflect.DeepEqual(got, want) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/provider/pulumi/aws/pulumi-aws-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.33.0
v4.37.5
6 changes: 3 additions & 3 deletions pkg/provider/pulumi/azure/azure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

func Test_azureProvider_Plugins(t *testing.T) {
want := []common.Plugin{
{Name: "azure-native", Version: "v1.56.0"},
{Name: "azure", Version: "v4.36.0"},
{Name: "azuread", Version: "v5.16.0"},
{Name: "azure-native", Version: "v1.60.0"},
{Name: "azure", Version: "v4.39.0"},
{Name: "azuread", Version: "v5.17.0"},
}
got := (&azureProvider{}).Plugins()
if !reflect.DeepEqual(got, want) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/provider/pulumi/azure/pulumi-azure-native-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.56.0
v1.60.0
2 changes: 1 addition & 1 deletion pkg/provider/pulumi/azure/pulumi-azure-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.36.0
v4.39.0
2 changes: 1 addition & 1 deletion pkg/provider/pulumi/azure/pulumi-azuread-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v5.16.0
v5.17.0
1 change: 0 additions & 1 deletion pkg/run/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ func (l *localServices) Start(pool worker.WorkerPool) error {
// running functions will connect to
l.mem, err = membrane.New(&membrane.MembraneOptions{
ServiceAddress: "0.0.0.0:50051",
ChildCommand: []string{"echo", "running membrane 🚀"},
SecretPlugin: secp,
QueuePlugin: qp,
StoragePlugin: sp,
Expand Down
2 changes: 1 addition & 1 deletion pkg/stack/function_helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func TestFunctionVersionString(t *testing.T) {
}{
{
name: "from embed",
want: "v0.13.0-rc.17",
want: "v0.14.0-rc.7",
},
}
for _, tt := range tests {
Expand Down
2 changes: 1 addition & 1 deletion pkg/stack/membraneversion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.13.0-rc.17
v0.14.0-rc.7

0 comments on commit a566a9b

Please sign in to comment.