Skip to content

Commit c1862d9

Browse files
author
liam.baker
committed
Update README.md
Signed-off-by: liam.baker <[email protected]> address comments and remove dependency on go-git Signed-off-by: liam.baker <[email protected]> Fix for regex for downloading Node.js Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Bump golang.org/x/crypto from 0.14.0 to 0.15.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.15.0. - [Commits](golang/crypto@v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Bump golang.org/x/mod from 0.13.0 to 0.14.0 Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.13.0 to 0.14.0. - [Commits](golang/mod@v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Bump github.com/spf13/cobra from 1.7.0 to 1.8.0 Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](spf13/cobra@v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> feat: add kwok to arkade get tools Signed-off-by: Czékus Máté <[email protected]> feat: add kwokctl to arkade get tools Signed-off-by: Czékus Máté <[email protected]> Update system go installation for new format The endpoint on go.dev now returns additional text after the version, \ntime. This change trims off the second half of the output. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Bump golang.org/x/crypto from 0.15.0 to 0.16.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.15.0 to 0.16.0. - [Commits](golang/crypto@v0.15.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Bump github.com/google/go-containerregistry from 0.16.1 to 0.17.0 Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.16.1 to 0.17.0. - [Release notes](https://github.com/google/go-containerregistry/releases) - [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml) - [Commits](google/go-containerregistry@v0.16.1...v0.17.0) --- updated-dependencies: - dependency-name: github.com/google/go-containerregistry dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Add rgee/snowmachine for the festive period Signed-off-by: Richard Gee <[email protected]> Bump actions/setup-go from 4 to 5 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Update README.md Signed-off-by: Alex Ellis <[email protected]> Export LoadFrom Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Bump go.mod and vendor Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Fix issue with version flag for Helm charts The version was being specified in an invalid way in args for the helm command via a string with a space. This has been changed to use a slice. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Bump golang.org/x/crypto from 0.16.0 to 0.17.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.16.0 to 0.17.0. - [Commits](golang/crypto@v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Move to Go 1.21 for builds and minimum version Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Limit builds for same SHA Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> Use Go 1.21 for e2e checker Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]> resolve modules.txt Signed-off-by: liam.baker <[email protected]> explicit sudo as documented in arkade.tape Signed-off-by: liam.baker <[email protected]> remove run elevated Signed-off-by: liam.baker <[email protected]> mod vendor Signed-off-by: liam.baker <[email protected]>
1 parent c0f395b commit c1862d9

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

‎cmd/system/aws_cli.go

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package system
22

33
import (
4-
"bufio"
54
"bytes"
65
"context"
76
"encoding/json"
@@ -25,8 +24,6 @@ import (
2524
"github.com/spf13/cobra"
2625
)
2726

28-
var runElevated bool
29-
3027
type ReferenceObject struct {
3128
Type string `json:"tag,omitempty"`
3229
}
@@ -54,18 +51,6 @@ func MakeInstallAWSCLI() *cobra.Command {
5451
command.Flags().Bool("run-installer", true, "Whether or not arkade should run the downloaded installer")
5552

5653
command.PreRunE = func(cmd *cobra.Command, args []string) error {
57-
fmt.Printf("Allow arkade to perform an elevated install (i.e. sudo)?\n\n")
58-
fmt.Println("Enter a value: ")
59-
reader := bufio.NewReader(os.Stdin)
60-
input, err := reader.ReadString('\n')
61-
if err != nil {
62-
return err
63-
}
64-
65-
if strings.EqualFold(input, "yes") {
66-
runElevated = true
67-
}
68-
6954
return nil
7055
}
7156

@@ -179,7 +164,7 @@ func MakeInstallAWSCLI() *cobra.Command {
179164
workDir = unpackPath
180165
}
181166

182-
if runInstaller && runElevated {
167+
if runInstaller {
183168
if err := runBundledInstaller(osVer, workDir, filename, installPath); err != nil {
184169
return err
185170
}
@@ -261,13 +246,12 @@ func runBundledInstaller(osVer string, workDir string, filename string, installP
261246

262247
switch osVer {
263248
case "Darwin":
264-
cmd = "sudo"
249+
cmd = "installer"
265250
pkgDir := fmt.Sprintf(" -pkg %s/%s", workDir, filename)
266-
args = append(args, "installer", pkgDir, "-target /")
251+
args = append(args, pkgDir, "-target /")
267252
case "Linux":
268-
cmd = "sudo"
269-
installerDir := fmt.Sprintf(".%s/install", workDir)
270-
args = append(args, installerDir, fmt.Sprintf("--bin-dir %s", installPath))
253+
cmd = fmt.Sprintf(".%s/install", workDir)
254+
args = append(args, fmt.Sprintf("--bin-dir %s", installPath))
271255
default:
272256
if strings.HasPrefix(osVer, "Ming") {
273257
cmd = "msiexec"

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ require (
1515
github.com/sethvargo/go-password v0.2.0
1616
github.com/spf13/cobra v1.8.0
1717
golang.org/x/crypto v0.17.0
18+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
1819
golang.org/x/mod v0.14.0
1920
gopkg.in/yaml.v3 v3.0.1
2021
)

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinC
8686
github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
8787
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
8888
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
89+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
90+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
8991
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
9092
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
9193
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=

‎vendor/modules.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ github.com/vbatts/tar-split/archive/tar
136136
## explicit; go 1.18
137137
golang.org/x/crypto/bcrypt
138138
golang.org/x/crypto/blowfish
139+
# golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
140+
## explicit; go 1.20
141+
golang.org/x/exp/constraints
142+
golang.org/x/exp/slices
139143
# golang.org/x/mod v0.14.0
140144
## explicit; go 1.18
141145
golang.org/x/mod/semver

0 commit comments

Comments
 (0)