Skip to content

Commit 145cf39

Browse files
committed
fix: update deps
- Changed the import path for oras-credentials-go to the new location in notation.go. - Updated the archive usage in notation_test.go to use the new Tar function with compression options.
1 parent 10439d4 commit 145cf39

File tree

9 files changed

+309
-290
lines changed

9 files changed

+309
-290
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: "^1.25"
22+
go-version: "^1.26"
2323
- name: "Check format"
2424
run: "test -z $(gofmt -l .)"
2525
- name: Build

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- run: git fetch --force --tags
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: '>=1.25.0'
24+
go-version: '>=1.26.0'
2525
cache: true
2626
# More assembly might be required: Docker logins, GPG, etc. It all depends
2727
# on your needs.

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
"go.coverOnSingleTest": true,
1515
"python.terminal.activateEnvironment": false,
1616
"workbench.preferredDarkColorTheme": "Default Dark Modern",
17-
"workbench.colorTheme": "Default Dark Modern"
17+
"workbench.colorTheme": "Default Dark Modern",
18+
"snyk.advanced.autoSelectOrganization": true
1819
}

cmd/nacp/nacp_otel_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ func TestOtelLogInstrumentation(t *testing.T) {
394394
debug("applying job validators", s("job", "example"), n("validators", 1)),
395395
debug("applying job validator", s("job", "example"), s("validator", "mock-validator")),
396396
debug("job validate results", s("job", "example"), s("validator", "mock-validator"), log.Slice("warnings", log.StringValue("some warning")), log.Empty("error")),
397-
debug("Job after admission controllers", s("job", "{\"Submission\":null,\"Job\":{\"Region\":\"global\",\"Namespace\":\"default\",\"ID\":\"example\",\"Name\":\"example\",\"Type\":\"service\",\"Priority\":50,\"AllAtOnce\":false,\"Datacenters\":[\"dc1\"],\"NodePool\":null,\"Constraints\":null,\"Affinities\":null,\"TaskGroups\":[{\"Name\":\"cache\",\"Count\":1,\"Constraints\":null,\"Affinities\":null,\"Tasks\":[{\"Name\":\"redis\",\"Driver\":\"docker\",\"User\":\"\",\"Lifecycle\":null,\"Config\":{\"auth_soft_fail\":true,\"image\":\"redis:7\",\"ports\":[\"db\"]},\"Constraints\":null,\"Affinities\":null,\"Env\":null,\"Services\":null,\"Resources\":{\"CPU\":500,\"Cores\":0,\"MemoryMB\":256,\"MemoryMaxMB\":0,\"DiskMB\":0,\"Networks\":null,\"Devices\":null,\"NUMA\":null,\"SecretsMB\":null,\"IOPS\":0},\"RestartPolicy\":{\"Interval\":1800000000000,\"Attempts\":2,\"Delay\":15000000000,\"Mode\":\"fail\",\"RenderTemplates\":null},\"Meta\":null,\"KillTimeout\":5000000000,\"LogConfig\":{\"MaxFiles\":10,\"MaxFileSizeMB\":10,\"Enabled\":null,\"Disabled\":null},\"Artifacts\":null,\"Vault\":{\"Policies\":[\"example-redis\"],\"Role\":\"\",\"Namespace\":\"\",\"Cluster\":\"\",\"Env\":true,\"DisableFile\":null,\"ChangeMode\":\"restart\",\"ChangeSignal\":\"SIGHUP\",\"AllowTokenExpiration\":null},\"Consul\":null,\"Templates\":null,\"DispatchPayload\":null,\"VolumeMounts\":null,\"Leader\":false,\"ShutdownDelay\":0,\"KillSignal\":\"\",\"Kind\":\"\",\"ScalingPolicies\":null,\"Identity\":null,\"Identities\":null,\"Actions\":null,\"Schedule\":null}],\"Spreads\":null,\"Volumes\":null,\"RestartPolicy\":{\"Interval\":1800000000000,\"Attempts\":2,\"Delay\":15000000000,\"Mode\":\"fail\",\"RenderTemplates\":null},\"Disconnect\":null,\"ReschedulePolicy\":{\"Attempts\":0,\"Interval\":0,\"Delay\":30000000000,\"DelayFunction\":\"exponential\",\"MaxDelay\":3600000000000,\"Unlimited\":true},\"EphemeralDisk\":{\"Sticky\":false,\"Migrate\":false,\"SizeMB\":300},\"Update\":{\"Stagger\":30000000000,\"MaxParallel\":1,\"HealthCheck\":\"checks\",\"MinHealthyTime\":10000000000,\"HealthyDeadline\":300000000000,\"ProgressDeadline\":600000000000,\"Canary\":0,\"AutoRevert\":false,\"AutoPromote\":false},\"Migrate\":{\"MaxParallel\":1,\"HealthCheck\":\"checks\",\"MinHealthyTime\":10000000000,\"HealthyDeadline\":300000000000},\"Networks\":[{\"Mode\":\"\",\"Device\":\"\",\"CIDR\":\"\",\"IP\":\"\",\"DNS\":null,\"ReservedPorts\":null,\"DynamicPorts\":[{\"Label\":\"db\",\"Value\":0,\"To\":6379,\"HostNetwork\":\"default\",\"IgnoreCollision\":false}],\"Hostname\":\"\",\"MBits\":0,\"CNI\":null}],\"Meta\":null,\"Services\":null,\"ShutdownDelay\":null,\"StopAfterClientDisconnect\":null,\"MaxClientDisconnect\":null,\"Scaling\":null,\"Consul\":{\"Namespace\":\"\",\"Cluster\":\"\",\"Partition\":\"\"},\"PreventRescheduleOnLost\":null}],\"Update\":{\"Stagger\":30000000000,\"MaxParallel\":1,\"HealthCheck\":\"\",\"MinHealthyTime\":0,\"HealthyDeadline\":0,\"ProgressDeadline\":0,\"Canary\":0,\"AutoRevert\":false,\"AutoPromote\":false},\"Multiregion\":null,\"Spreads\":null,\"Periodic\":null,\"ParameterizedJob\":null,\"Reschedule\":null,\"Migrate\":null,\"Meta\":null,\"UI\":null,\"Stop\":false,\"ParentID\":\"\",\"Dispatched\":false,\"DispatchIdempotencyToken\":\"\",\"Payload\":null,\"ConsulNamespace\":\"\",\"VaultNamespace\":\"\",\"NomadTokenID\":\"\",\"Status\":\"pending\",\"StatusDescription\":\"\",\"Stable\":false,\"Version\":0,\"SubmitTime\":1675891187313750000,\"CreateIndex\":11,\"ModifyIndex\":11,\"JobModifyIndex\":11,\"VersionTag\":null},\"Region\":\"\",\"Namespace\":\"\",\"SecretID\":\"\"}")),
397+
debug("Job after admission controllers", s("job", "{\"Submission\":null,\"Job\":{\"Region\":\"global\",\"Namespace\":\"default\",\"ID\":\"example\",\"Name\":\"example\",\"Type\":\"service\",\"Priority\":50,\"AllAtOnce\":false,\"Datacenters\":[\"dc1\"],\"NodePool\":null,\"Constraints\":null,\"Affinities\":null,\"TaskGroups\":[{\"Name\":\"cache\",\"Count\":1,\"Constraints\":null,\"Affinities\":null,\"Tasks\":[{\"Name\":\"redis\",\"Driver\":\"docker\",\"User\":\"\",\"Lifecycle\":null,\"Config\":{\"auth_soft_fail\":true,\"image\":\"redis:7\",\"ports\":[\"db\"]},\"Constraints\":null,\"Affinities\":null,\"Env\":null,\"Services\":null,\"Resources\":{\"CPU\":500,\"Cores\":0,\"MemoryMB\":256,\"MemoryMaxMB\":0,\"DiskMB\":0,\"Networks\":null,\"Devices\":null,\"NUMA\":null,\"SecretsMB\":null,\"IOPS\":0},\"RestartPolicy\":{\"Interval\":1800000000000,\"Attempts\":2,\"Delay\":15000000000,\"Mode\":\"fail\",\"RenderTemplates\":null},\"Meta\":null,\"KillTimeout\":5000000000,\"LogConfig\":{\"MaxFiles\":10,\"MaxFileSizeMB\":10,\"Enabled\":null,\"Disabled\":null},\"Artifacts\":null,\"Vault\":{\"Policies\":[\"example-redis\"],\"Role\":\"\",\"Namespace\":\"\",\"Cluster\":\"\",\"Env\":true,\"DisableFile\":null,\"ChangeMode\":\"restart\",\"ChangeSignal\":\"SIGHUP\",\"AllowTokenExpiration\":null},\"Consul\":null,\"Templates\":null,\"DispatchPayload\":null,\"VolumeMounts\":null,\"Leader\":false,\"ShutdownDelay\":0,\"KillSignal\":\"\",\"Kind\":\"\",\"ScalingPolicies\":null,\"Secrets\":null,\"Identity\":null,\"Identities\":null,\"Actions\":null,\"Schedule\":null}],\"Spreads\":null,\"Volumes\":null,\"RestartPolicy\":{\"Interval\":1800000000000,\"Attempts\":2,\"Delay\":15000000000,\"Mode\":\"fail\",\"RenderTemplates\":null},\"Disconnect\":null,\"ReschedulePolicy\":{\"Attempts\":0,\"Interval\":0,\"Delay\":30000000000,\"DelayFunction\":\"exponential\",\"MaxDelay\":3600000000000,\"Unlimited\":true},\"EphemeralDisk\":{\"Sticky\":false,\"Migrate\":false,\"SizeMB\":300},\"Update\":{\"Stagger\":30000000000,\"MaxParallel\":1,\"HealthCheck\":\"checks\",\"MinHealthyTime\":10000000000,\"HealthyDeadline\":300000000000,\"ProgressDeadline\":600000000000,\"Canary\":0,\"AutoRevert\":false,\"AutoPromote\":false},\"Migrate\":{\"MaxParallel\":1,\"HealthCheck\":\"checks\",\"MinHealthyTime\":10000000000,\"HealthyDeadline\":300000000000},\"Networks\":[{\"Mode\":\"\",\"Device\":\"\",\"CIDR\":\"\",\"IP\":\"\",\"DNS\":null,\"ReservedPorts\":null,\"DynamicPorts\":[{\"Label\":\"db\",\"Value\":0,\"To\":6379,\"HostNetwork\":\"default\",\"IgnoreCollision\":false}],\"Hostname\":\"\",\"MBits\":0,\"CNI\":null}],\"Meta\":null,\"Services\":null,\"ShutdownDelay\":null,\"StopAfterClientDisconnect\":null,\"MaxClientDisconnect\":null,\"Scaling\":null,\"Consul\":{\"Namespace\":\"\",\"Cluster\":\"\",\"Partition\":\"\"},\"PreventRescheduleOnLost\":null}],\"Update\":{\"Stagger\":30000000000,\"MaxParallel\":1,\"HealthCheck\":\"\",\"MinHealthyTime\":0,\"HealthyDeadline\":0,\"ProgressDeadline\":0,\"Canary\":0,\"AutoRevert\":false,\"AutoPromote\":false},\"Multiregion\":null,\"Spreads\":null,\"Periodic\":null,\"ParameterizedJob\":null,\"Reschedule\":null,\"Migrate\":null,\"Meta\":null,\"UI\":null,\"Stop\":false,\"ParentID\":\"\",\"Dispatched\":false,\"DispatchIdempotencyToken\":\"\",\"Payload\":null,\"ConsulNamespace\":\"\",\"VaultNamespace\":\"\",\"NomadTokenID\":\"\",\"Status\":\"pending\",\"StatusDescription\":\"\",\"Stable\":false,\"Version\":0,\"SubmitTime\":1675891187313750000,\"CreateIndex\":11,\"ModifyIndex\":11,\"JobModifyIndex\":11,\"VersionTag\":null},\"Region\":\"\",\"Namespace\":\"\",\"SecretID\":\"\"}")),
398398
),
399399
},
400400
}

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25
1+
FROM golang:1.26
22

33
WORKDIR /app
44

0 commit comments

Comments
 (0)