Skip to content

Commit e2822db

Browse files
authored
Merge branch 'master' into v1.5822.0
2 parents 5fd8c7b + 54b7fe9 commit e2822db

File tree

4 files changed

+64
-22
lines changed

4 files changed

+64
-22
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
- name: Run coverage
2020
run: go test -coverprofile=coverage.out -covermode=count ./...
2121
- name: Upload coverage to Codecov
22-
uses: codecov/codecov-action@v4
22+
uses: codecov/codecov-action@v5

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.22.2
77
require (
88
github.com/alecthomas/assert v1.0.0
99
github.com/aws/aws-sdk-go-v2 v1.32.6
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.69.0
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.70.0
1111
github.com/buildpacks/pack v0.34.2
1212
github.com/c-bata/go-prompt v0.2.6
1313
github.com/charmbracelet/bubbletea v1.2.4
@@ -63,16 +63,16 @@ require (
6363
github.com/aws/aws-sdk-go-v2/config v1.27.7 // indirect
6464
github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect
6565
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect
66-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
67-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
66+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
67+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
6868
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
69-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 // indirect
69+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
7070
github.com/aws/aws-sdk-go-v2/service/ecr v1.24.5 // indirect
7171
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.5 // indirect
7272
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
73-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 // indirect
74-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
75-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 // indirect
73+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
74+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
75+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
7676
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect
7777
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect
7878
github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect

go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,28 @@ github.com/aws/aws-sdk-go-v2/credentials v1.17.7 h1:WJd+ubWKoBeRh7A5iNMnxEOs982S
7676
github.com/aws/aws-sdk-go-v2/credentials v1.17.7/go.mod h1:UQi7LMR0Vhvs+44w5ec8Q+VS+cd10cjwgHwiVkE0YGU=
7777
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 h1:p+y7FvkK2dxS+FEwRIDHDe//ZX+jDhP8HHE50ppj4iI=
7878
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3/go.mod h1:/fYB+FZbDlwlAiynK9KDXlzZl3ANI9JkD0Uhz5FjNT4=
79-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 h1:4usbeaes3yJnCFC7kfeyhkdkPtoRYPa/hTmCqMpKpLI=
80-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24/go.mod h1:5CI1JemjVwde8m2WG3cz23qHKPOxbpkq0HaoreEgLIY=
81-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 h1:N1zsICrQglfzaBnrfM0Ys00860C+QFwu6u/5+LomP+o=
82-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24/go.mod h1:dCn9HbJ8+K31i8IQ8EWmWj0EiIk0+vKiHNMxTTYveAg=
79+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 h1:s/fF4+yDQDoElYhfIVvSNyeCydfbuTKzhxSXDXCPasU=
80+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25/go.mod h1:IgPfDv5jqFIzQSNbUEMoitNooSMXjRSDkhXv8jiROvU=
81+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 h1:ZntTCl5EsYnhN/IygQEUugpdwbhdkom9uHcbCftiGgA=
82+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25/go.mod h1:DBdPrgeocww+CSl1C8cEV8PN1mHMBhuCDLpXezyvWkE=
8383
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
8484
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
85-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 h1:JX70yGKLj25+lMC5Yyh8wBtvB01GDilyRuJvXJ4piD0=
86-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24/go.mod h1:+Ln60j9SUTD0LEwnhEB0Xhg61DHqplBrbZpLgyjoEHg=
85+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 h1:r67ps7oHCYnflpgDy2LZU0MAQtQbYIOqNNnqGO6xQkE=
86+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25/go.mod h1:GrGY+Q4fIokYLtjCVB/aFfCVL6hhGUFl8inD18fDalE=
8787
github.com/aws/aws-sdk-go-v2/service/ecr v1.24.5 h1:wLPDAUFT50NEXGXpywRU3AA74pg35RJjWol/68ruvQQ=
8888
github.com/aws/aws-sdk-go-v2/service/ecr v1.24.5/go.mod h1:AOHmGMoPtSY9Zm2zBuwUJQBisIvYAZeA1n7b6f4e880=
8989
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.5 h1:PQp21GBlGNaQ+AVJAB8w2KTmLx0DkFS2fDET2Iy3+f0=
9090
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.5/go.mod h1:WMntdAol8KgeYsa5sDZPsRTXs4jVZIMYu0eQVVIQxnc=
9191
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
9292
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
93-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 h1:gvZOjQKPxFXy1ft3QnEyXmT+IqneM9QAUWlM3r0mfqw=
94-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5/go.mod h1:DLWnfvIcm9IET/mmjdxeXbBKmTCm0ZB8p1za9BVteM8=
95-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 h1:wtpJ4zcwrSbwhECWQoI/g6WM9zqCcSpHDJIWSbMLOu4=
96-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5/go.mod h1:qu/W9HXQbbQ4+1+JcZp0ZNPV31ym537ZJN+fiS7Ti8E=
97-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 h1:P1doBzv5VEg1ONxnJss1Kh5ZG/ewoIE4MQtKKc6Crgg=
98-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5/go.mod h1:NOP+euMW7W3Ukt28tAxPuoWao4rhhqJD3QEBk7oCg7w=
99-
github.com/aws/aws-sdk-go-v2/service/s3 v1.69.0 h1:Q2ax8S21clKOnHhhr933xm3JxdJebql+R7aNo7p7GBQ=
100-
github.com/aws/aws-sdk-go-v2/service/s3 v1.69.0/go.mod h1:ralv4XawHjEMaHOWnTFushl0WRqim/gQWesAMF6hTow=
93+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 h1:HCpPsWqmYQieU7SS6E9HXfdAMSud0pteVXieJmcpIRI=
94+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6/go.mod h1:ngUiVRCco++u+soRRVBIvBZxSMMvOVMXA4PJ36JLfSw=
95+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 h1:50+XsN70RS7dwJ2CkVNXzj7U2L1HKP8nqTd3XWEXBN4=
96+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6/go.mod h1:WqgLmwY7so32kG01zD8CPTJWVWM+TzJoOVHwTg4aPug=
97+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 h1:BbGDtTi0T1DYlmjBiCr/le3wzhA37O8QTC5/Ab8+EXk=
98+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6/go.mod h1:hLMJt7Q8ePgViKupeymbqI0la+t9/iYFBjxQCFwuAwI=
99+
github.com/aws/aws-sdk-go-v2/service/s3 v1.70.0 h1:HrHFR8RoS4l4EvodRMFcJMYQ8o3UhmALn2nbInXaxZA=
100+
github.com/aws/aws-sdk-go-v2/service/s3 v1.70.0/go.mod h1:sT/iQz8JK3u/5gZkT+Hmr7GzVZehUMkRZpOaAwYXeGY=
101101
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc=
102102
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0=
103103
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE=

scripts/windows/install.ps1

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Ensure you are running this powershell script on Windows as an administrator
2+
3+
Get-WindowsCapability -Online | Where-Object Name -like 'OpenSSH*'
4+
5+
# Install the OpenSSH Client
6+
Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
7+
8+
# Install the OpenSSH Server
9+
Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
10+
11+
# Start the sshd service
12+
Start-Service sshd
13+
14+
# OPTIONAL but recommended:
15+
Set-Service -Name sshd -StartupType 'Automatic'
16+
17+
# Confirm the Firewall rule is configured. It should be created automatically by setup. Run the following to verify
18+
if (!(Get-NetFirewallRule -Name "OpenSSH-Server-In-TCP" -ErrorAction SilentlyContinue | Select-Object Name, Enabled)) {
19+
Write-Output "Firewall Rule 'OpenSSH-Server-In-TCP' does not exist, creating it..."
20+
New-NetFirewallRule -Name 'OpenSSH-Server-In-TCP' -DisplayName 'OpenSSH Server (sshd)' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 22
21+
} else {
22+
Write-Output "Firewall rule 'OpenSSH-Server-In-TCP' has been created and exists."
23+
}
24+
25+
# Replace this line with your own SSH key
26+
echo "INSERT YOUR PUBLIC SSH KEY (id_rsa.pub or id_ed25519.pub) IN PLAIN TEXT HERE" > "C:\ProgramData\ssh\administrators_authorized_keys"
27+
28+
# Give the right permission on the file
29+
icacls.exe "C:\ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F"
30+
31+
# Install Chocolatey
32+
Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
33+
34+
# Install golang and git
35+
choco install -y golang git
36+
37+
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
38+
refreshenv
39+
40+
go version
41+
42+
git version

0 commit comments

Comments
 (0)