Skip to content

Commit

Permalink
Merge branch 'master' into update_kompose_convert
Browse files Browse the repository at this point in the history
Signed-off-by: winkletinkle <[email protected]>
  • Loading branch information
winkletinkle authored Jan 14, 2025
2 parents 53a791e + 48aed15 commit e57c1bf
Show file tree
Hide file tree
Showing 14 changed files with 138 additions and 123 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
golangci:
name: lint
needs: [tidy]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-go@master
Expand All @@ -27,7 +27,7 @@ jobs:
run: make check
tidy:
name: tidy
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-go@master
Expand All @@ -40,7 +40,7 @@ jobs:
codecov:
name: codecov
needs: [ tidy ]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-go@v5
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/error-codes-updater.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
name: Meshkit Error Codes Utility Runner
on:
workflow_dispatch:
push:
branches:
- 'master'
- "master"
paths:
- '**.go'
- "**.go"

jobs:
Update-error-codes:
name: Error codes utility
if: github.repository == 'layer5io/meshkit'
runs-on: ubuntu-latest
if: github.repository == 'meshery/meshkit'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
# token here with write access to meshkit repo
# token here with write access to meshkit repo
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
ref: 'master'
ref: "master"

- name: Setup Go
uses: actions/setup-go@master
with:
go-version: '1.23'
go-version: "1.23"

- name: Run utility
run: |
Expand All @@ -37,19 +38,19 @@ jobs:
commit_user_name: l5io
commit_user_email: [email protected]
commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
commit_options: '--signoff'
commit_options: "--signoff"
commit_message: "run error codes utility"
file_pattern: helpers/ **.go

# to push changes to meshery docs
- name: Checkout meshery
uses: actions/checkout@master
with:
repository: 'meshery/meshery'
repository: "meshery/meshery"
# token with write access to meshery repository
token: ${{ secrets.GH_ACCESS_TOKEN }}
path: 'meshery'
ref: 'master'
path: "meshery"
ref: "master"

- name: Update and push docs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
Expand Down
14 changes: 7 additions & 7 deletions encoding/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
)

const (
ErrDecodeYamlCode = ""
ErrUnmarshalCode = ""
ErrUnmarshalInvalidCode = ""
ErrUnmarshalSyntaxCode = ""
ErrUnmarshalTypeCode = ""
ErrUnmarshalUnsupportedTypeCode = ""
ErrUnmarshalUnsupportedValueCode = ""
ErrDecodeYamlCode = "meshkit-11245"
ErrUnmarshalCode = "meshkit-11246"
ErrUnmarshalInvalidCode = "meshkit-11247"
ErrUnmarshalSyntaxCode = "meshkit-11248"
ErrUnmarshalTypeCode = "meshkit-11249"
ErrUnmarshalUnsupportedTypeCode = "meshkit-11250"
ErrUnmarshalUnsupportedValueCode = "meshkit-11251"
)

// ErrDecodeYaml is the error when the yaml unmarshal fails
Expand Down
4 changes: 2 additions & 2 deletions generators/artifacthub/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ var (
ErrGetAhPackageCode = "meshkit-11135"
ErrComponentGenerateCode = "meshkit-11136"
ErrGetAllHelmPackagesCode = "meshkit-11137"
ErrChartUrlEmptyCode = "replace_me"
ErrNoPackageFoundCode = "replace_me"
ErrChartUrlEmptyCode = "meshkit-11252"
ErrNoPackageFoundCode = "meshkit-11253"
)

func ErrGetAllHelmPackages(err error) error {
Expand Down
30 changes: 15 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/fluxcd/pkg/oci v0.34.0
github.com/fluxcd/pkg/tar v0.4.0
github.com/go-git/go-git/v5 v5.11.0
github.com/go-git/go-git/v5 v5.13.0
github.com/go-logr/logr v1.4.2
github.com/gofrs/uuid v4.4.0+incompatible
github.com/google/go-containerregistry v0.17.0
Expand All @@ -32,7 +32,7 @@ require (
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.18.2
golang.org/x/oauth2 v0.20.0
golang.org/x/text v0.16.0
golang.org/x/text v0.21.0
google.golang.org/api v0.153.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand Down Expand Up @@ -64,7 +64,7 @@ require (
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/aws/aws-sdk-go-v2 v1.24.0 // indirect
Expand All @@ -84,15 +84,15 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
github.com/compose-spec/compose-go v1.19.0 // indirect
github.com/containerd/containerd v1.7.20 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
Expand All @@ -118,7 +118,7 @@ require (
github.com/fsouza/go-dockerclient v1.9.7 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-billy/v5 v5.6.0 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down Expand Up @@ -209,9 +209,9 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
Expand All @@ -233,14 +233,14 @@ require (
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
Expand Down
Loading

0 comments on commit e57c1bf

Please sign in to comment.