Skip to content

Commit feda975

Browse files
authored
Merge pull request #50 from carolynvs/bump-porter
Bump porter to v1.0.1
2 parents aeb9e6f + 9430540 commit feda975

File tree

3 files changed

+145
-89
lines changed

3 files changed

+145
-89
lines changed

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pool:
1515
steps:
1616
- task: GoTool@0
1717
inputs:
18-
version: '1.18.6'
18+
version: '1.19.2'
1919
displayName: 'Install Go'
2020

2121
- script: go run mage.go ConfigureAgent

go.mod

+35-40
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module get.porter.sh/mixin/arm
22

3-
go 1.18
3+
go 1.19
44

55
// These are replace directives copied from porter
66
// When you use a newer version of Porter, if you run into trouble with go mod tidy
@@ -10,39 +10,22 @@ go 1.18
1010
replace github.com/spf13/viper => github.com/getporter/viper v1.7.1-porter.2.0.20210514172839-3ea827168363
1111

1212
require (
13-
get.porter.sh/porter v1.0.0-rc.2
13+
get.porter.sh/magefiles v0.3.3
14+
get.porter.sh/porter v1.0.1
1415
github.com/Azure/azure-sdk-for-go v42.3.0+incompatible
1516
github.com/Azure/go-autorest/autorest v0.11.18
1617
github.com/Azure/go-autorest/autorest/adal v0.9.13
1718
github.com/Masterminds/sprig v2.22.0+incompatible
1819
github.com/gobuffalo/packr/v2 v2.8.0
1920
github.com/kelseyhightower/envconfig v1.4.0
2021
github.com/pkg/errors v0.9.1
21-
github.com/spf13/cobra v1.2.1
22+
github.com/spf13/cobra v1.5.0
2223
github.com/stretchr/testify v1.7.1
23-
go.opentelemetry.io/otel v1.7.0
24+
go.opentelemetry.io/otel v1.10.0
2425
gopkg.in/yaml.v2 v2.4.0
2526
)
2627

2728
require (
28-
github.com/andybalholm/brotli v1.0.1 // indirect
29-
github.com/carolynvs/magex v0.9.0 // indirect
30-
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
31-
github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70 // indirect
32-
github.com/jeremywohl/flatten v1.0.1 // indirect
33-
github.com/klauspost/pgzip v1.2.5 // indirect
34-
github.com/kr/pretty v0.2.1 // indirect
35-
github.com/magefile/mage v1.13.0 // indirect
36-
github.com/mholt/archiver/v3 v3.5.1 // indirect
37-
github.com/nwaples/rardecode v1.1.0 // indirect
38-
github.com/pierrec/lz4/v4 v4.1.2 // indirect
39-
github.com/smartystreets/assertions v1.0.0 // indirect
40-
github.com/ulikunitz/xz v0.5.10 // indirect
41-
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
42-
)
43-
44-
require (
45-
get.porter.sh/magefiles v0.3.2
4629
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4730
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
4831
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
@@ -54,11 +37,13 @@ require (
5437
github.com/Masterminds/semver v1.5.0 // indirect
5538
github.com/Masterminds/semver/v3 v3.1.1 // indirect
5639
github.com/PuerkitoBio/goquery v1.5.0 // indirect
40+
github.com/andybalholm/brotli v1.0.1 // indirect
5741
github.com/andybalholm/cascadia v1.0.0 // indirect
5842
github.com/beorn7/perks v1.0.1 // indirect
5943
github.com/carolynvs/aferox v0.3.0 // indirect
60-
github.com/cbroglie/mustache v1.0.1 // indirect
61-
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
44+
github.com/carolynvs/magex v0.9.0 // indirect
45+
github.com/cbroglie/mustache v1.4.0 // indirect
46+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
6247
github.com/cespare/xxhash/v2 v2.1.2 // indirect
6348
github.com/cnabio/cnab-go v0.24.0 // indirect
6449
github.com/cnabio/cnab-to-oci v0.3.7 // indirect
@@ -72,6 +57,7 @@ require (
7257
github.com/docker/go-connections v0.4.0 // indirect
7358
github.com/docker/go-metrics v0.0.1 // indirect
7459
github.com/docker/go-units v0.4.0 // indirect
60+
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
7561
github.com/fatih/color v1.9.0 // indirect
7662
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
7763
github.com/fsnotify/fsnotify v1.4.9 // indirect
@@ -82,27 +68,33 @@ require (
8268
github.com/goccy/go-yaml v1.8.1 // indirect
8369
github.com/gogo/protobuf v1.3.2 // indirect
8470
github.com/golang/protobuf v1.5.2 // indirect
71+
github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70 // indirect
8572
github.com/google/go-containerregistry v0.5.1 // indirect
8673
github.com/google/uuid v1.3.0 // indirect
8774
github.com/gorilla/mux v1.8.0 // indirect
88-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
75+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
8976
github.com/hashicorp/errwrap v1.1.0 // indirect
9077
github.com/hashicorp/go-hclog v0.14.1 // indirect
9178
github.com/hashicorp/go-multierror v1.1.1 // indirect
9279
github.com/hashicorp/hcl v1.0.0 // indirect
9380
github.com/huandu/xstrings v1.3.0 // indirect
9481
github.com/imdario/mergo v0.3.12 // indirect
9582
github.com/inconshreveable/mousetrap v1.0.0 // indirect
83+
github.com/jeremywohl/flatten v1.0.1 // indirect
9684
github.com/karrick/godirwalk v1.15.3 // indirect
9785
github.com/klauspost/compress v1.15.1 // indirect
86+
github.com/klauspost/pgzip v1.2.5 // indirect
87+
github.com/kr/pretty v0.2.1 // indirect
88+
github.com/magefile/mage v1.14.0 // indirect
9889
github.com/magiconair/properties v1.8.5 // indirect
9990
github.com/markbates/errx v1.1.0 // indirect
10091
github.com/markbates/oncer v1.0.0 // indirect
10192
github.com/markbates/safe v1.0.1 // indirect
10293
github.com/mattn/go-colorable v0.1.7 // indirect
103-
github.com/mattn/go-isatty v0.0.14 // indirect
94+
github.com/mattn/go-isatty v0.0.16 // indirect
10495
github.com/mattn/go-runewidth v0.0.9 // indirect
10596
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
97+
github.com/mholt/archiver/v3 v3.5.1 // indirect
10698
github.com/mikefarah/yq/v3 v3.0.0-20201020025845-ccb718cd0f59 // indirect
10799
github.com/mitchellh/copystructure v1.0.0 // indirect
108100
github.com/mitchellh/mapstructure v1.4.2 // indirect
@@ -111,13 +103,15 @@ require (
111103
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
112104
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
113105
github.com/morikuni/aec v1.0.0 // indirect
106+
github.com/nwaples/rardecode v1.1.0 // indirect
114107
github.com/oklog/ulid v1.3.1 // indirect
115108
github.com/olekukonko/tablewriter v0.0.4 // indirect
116109
github.com/opencontainers/go-digest v1.0.0 // indirect
117110
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
118111
github.com/osteele/liquid v1.3.0 // indirect
119112
github.com/osteele/tuesday v1.0.3 // indirect
120113
github.com/pelletier/go-toml v1.9.4 // indirect
114+
github.com/pierrec/lz4/v4 v4.1.2 // indirect
121115
github.com/pmezard/go-difflib v1.0.0 // indirect
122116
github.com/prometheus/client_golang v1.12.1 // indirect
123117
github.com/prometheus/client_model v0.2.0 // indirect
@@ -126,24 +120,27 @@ require (
126120
github.com/qri-io/jsonpointer v0.1.1 // indirect
127121
github.com/qri-io/jsonschema v0.2.2-0.20210831022256-780655b2ba0e // indirect
128122
github.com/sirupsen/logrus v1.8.1 // indirect
129-
github.com/spf13/afero v1.6.0 // indirect
123+
github.com/smartystreets/assertions v1.0.0 // indirect
124+
github.com/spf13/afero v1.9.2 // indirect
130125
github.com/spf13/cast v1.3.1 // indirect
131126
github.com/spf13/jwalterweatherman v1.1.0 // indirect
132127
github.com/spf13/pflag v1.0.5 // indirect
133-
github.com/spf13/viper v1.8.1 // indirect
128+
github.com/spf13/viper v1.10.0 // indirect
134129
github.com/subosito/gotenv v1.2.0 // indirect
130+
github.com/ulikunitz/xz v0.5.10 // indirect
135131
github.com/vbatts/tar-split v0.11.2 // indirect
136132
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
137133
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
138134
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
139-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect
140-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
141-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect
142-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 // indirect
143-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 // indirect
144-
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
145-
go.opentelemetry.io/otel/trace v1.7.0 // indirect
146-
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
135+
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
136+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
137+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
138+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
139+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.10.0 // indirect
140+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.10.0 // indirect
141+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
142+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
143+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
147144
go.uber.org/atomic v1.7.0 // indirect
148145
go.uber.org/multierr v1.6.0 // indirect
149146
go.uber.org/zap v1.17.0 // indirect
@@ -155,11 +152,9 @@ require (
155152
golang.org/x/text v0.3.7 // indirect
156153
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
157154
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
158-
google.golang.org/grpc v1.45.0 // indirect
159-
google.golang.org/protobuf v1.27.1 // indirect
155+
google.golang.org/grpc v1.50.0 // indirect
156+
google.golang.org/protobuf v1.28.0 // indirect
160157
gopkg.in/ini.v1 v1.62.0 // indirect
161158
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
162159
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
163160
)
164-
165-
replace github.com/hashicorp/go-plugin => github.com/carolynvs/go-plugin v1.0.1-acceptstdin

0 commit comments

Comments
 (0)