Skip to content

Commit

Permalink
Merge pull request #297 from carolynvs/bump-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
carolynvs authored Feb 21, 2023
2 parents cc800b2 + 8bf212d commit 64500f7
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 582 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ delete-test-cluster:

GOPATH := $(shell go env GOPATH)
HAS_GOLANGCI := $(shell $(CHECK) golangci-lint)
GOLANGCI_VERSION := v1.46.2
GOLANGCI_VERSION := v1.51.2
HAS_KIND := $(shell $(CHECK) kind)
HAS_KUBECTL := $(shell $(CHECK) kubectl)
HAS_GOCOV_XML := $(shell $(CHECK) gocov-xml;)
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pool:
steps:
- task: GoTool@0
inputs:
version: '1.17.8'
version: '1.19.6'
displayName: 'Install Go'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion brigade.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { events, Job } = require("brigadier");
const projectOrg = "cnabio";
const projectName = "cnab-go";

const goImg = "golang:1.17";
const goImg = "golang:1.19";
const gopath = "/go";
const localPath = gopath + `/src/github.com/${projectOrg}/${projectName}`;

Expand Down
2 changes: 1 addition & 1 deletion bundle/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
// CNABSpecVersion represents the CNAB Spec version of the Bundle
// that this library implements
// This value is prefixed with e.g. `cnab-core-` so isn't itself valid semver.
var CNABSpecVersion string = "cnab-core-1.2.0"
var CNABSpecVersion = "cnab-core-1.2.0"

// Bundle is a CNAB metadata document
type Bundle struct {
Expand Down
4 changes: 2 additions & 2 deletions bundle/bundle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
yaml "gopkg.in/yaml.v2"
"gopkg.in/yaml.v2"

"github.com/cnabio/cnab-go/bundle/definition"
"github.com/cnabio/cnab-go/schema"
Expand Down Expand Up @@ -583,7 +583,7 @@ var exampleCred = Credential{
},
}

var exampleBundle *Bundle = &Bundle{
var exampleBundle = &Bundle{
SchemaVersion: "1.0.1",
Name: "testBundle",
Description: "something",
Expand Down
2 changes: 1 addition & 1 deletion bundle/loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type BundleLoader interface {
type Loader struct{}

// New creates a loader for bundle files.
//TODO: remove if unnecessary
// TODO: remove if unnecessary
func New() BundleLoader {
return &Loader{}
}
Expand Down
49 changes: 29 additions & 20 deletions claim/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,42 @@ by the result ID and are keyed by the "ResultID-OutputName" to generate a unique
The groups allow for querying by storage systems that support it.
claims/
INSTALLATION/
CLAIM_ID
INSTALLATION/
CLAIM_ID
results/
CLAIM_ID/
RESULT_ID
CLAIM_ID/
RESULT_ID
outputs/
RESULT_ID/
RESULT_ID-OUTPUT_NAME
Example
RESULT_ID/
RESULT_ID-OUTPUT_NAME
# Example
claims/
mysql/
01EAZDEPCBPEEHQG9C4AF5X1PY.json (install)
01EAZDEW0R8MQ0GS5D5EAQA2J9.json (upgrade)
wordpress/
01EAZDF3ARH5J2D7A30A8Z9QRW.json (install)
mysql/
01EAZDEPCBPEEHQG9C4AF5X1PY.json (install)
01EAZDEW0R8MQ0GS5D5EAQA2J9.json (upgrade)
wordpress/
01EAZDF3ARH5J2D7A30A8Z9QRW.json (install)
results/
01EAZDEPCBPEEHQG9C4AF5X1PY/ (mysql - install)
01EAZDGPM8EQKXA544AHCBMYXH.json (success)
01EAZDEW0R8MQ0GS5D5EAQA2J9 (mysql - upgrade)
01EAZDHFZJE34ND6GE3BVPP1JA (success)
01EAZDF3ARH5J2D7A30A8Z9QRW (wordpress - install)
01EAZDJ8FPR0CD8BNG8EBBGA0N (running)
01EAZDEPCBPEEHQG9C4AF5X1PY/ (mysql - install)
01EAZDGPM8EQKXA544AHCBMYXH.json (success)
01EAZDEW0R8MQ0GS5D5EAQA2J9 (mysql - upgrade)
01EAZDHFZJE34ND6GE3BVPP1JA (success)
01EAZDF3ARH5J2D7A30A8Z9QRW (wordpress - install)
01EAZDJ8FPR0CD8BNG8EBBGA0N (running)
outputs/
01EAZDGPM8EQKXA544AHCBMYXH/
01EAZDGPM8EQKXA544AHCBMYXH-CONNECTIONSTRING
01EAZDGPM8EQKXA544AHCBMYXH/
01EAZDGPM8EQKXA544AHCBMYXH-CONNECTIONSTRING
*/
package claim
8 changes: 4 additions & 4 deletions credentials/credentialset.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ func Validate(given valuesource.Set, spec map[string]bundle.Credential, action s
//
// The typical workflow for working with a credential set is:
//
// - Load the set
// - Validate the credentials against a spec
// - Resolve the credentials
// - Expand them into bundle values
// - Load the set
// - Validate the credentials against a spec
// - Resolve the credentials
// - Expand them into bundle values
func (c *CredentialSet) ResolveCredentials(s secrets.Store) (valuesource.Set, error) {
l := len(c.Credentials)
res := make(map[string]string, l)
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/cnabio/cnab-go

go 1.17
go 1.19

require (
github.com/Masterminds/semver v1.5.0
github.com/cnabio/image-relocation v0.0.0-20220815190842-cd2f11ecad88
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
github.com/docker/cli v23.0.0-rc.1+incompatible
github.com/docker/cli v23.0.1+incompatible
github.com/docker/distribution v2.8.1+incompatible
github.com/docker/docker v23.0.0-rc.1+incompatible
github.com/docker/docker v23.0.1+incompatible
github.com/docker/go-connections v0.4.0
github.com/hashicorp/go-multierror v1.1.1
github.com/mitchellh/copystructure v1.0.0
Expand Down Expand Up @@ -105,12 +105,12 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
Expand Down
Loading

0 comments on commit 64500f7

Please sign in to comment.