sam_oneal/pulumi-docker-build
1
0
Fork 0
Code Actions Packages Releases Wiki Activity

Use 'buildkit' as default scope (#516)

Browse Source 
This PR updates the schema to use the correct default value for `scope`
in the GHA caching options. This should be effectively a no-op.


From: https://docs.docker.com/build/cache/backends/gha/

<img width="892" alt="image"
src="https://github.com/user-attachments/assets/690cde79-e30e-4085-81fd-1c9dc1c6d7e9"
/>


Closes #496
This commit is contained in:
Eron Wright
2025-04-09 14:01:21 -07:00
committed by GitHub
parent 706136a454
commit 780fe97f99
13 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -4,6 +4,7 @@
- Multiple exports are now allowed if the build daemon is detected to have - Multiple exports are now allowed if the build daemon is detected to have
version 0.13 of Buildkit or newer. (<https://github.com/pulumi/pulumi-docker-build/issues/21>) version 0.13 of Buildkit or newer. (<https://github.com/pulumi/pulumi-docker-build/issues/21>)
- Use 'buildkit' as default scope (<https://github.com/pulumi/pulumi-docker-build/pull/516>)
### Changed ### Changed

14
provider/cmd/pulumi-resource-docker-build/schema.json
View File

@@ -159,12 +159,7 @@
"scope": { "scope": {
"type": "string", "type": "string",
"description": "The scope to use for cache keys. Defaults to `buildkit`.\n\nThis should be set if building and caching multiple images in one\nworkflow, otherwise caches will overwrite each other.", "description": "The scope to use for cache keys. Defaults to `buildkit`.\n\nThis should be set if building and caching multiple images in one\nworkflow, otherwise caches will overwrite each other.",
"default": "", "default": "buildkit"
"defaultInfo": {
"environment": [
"buildkit"
]
}
}, },
"token": { "token": {
"type": "string", "type": "string",
@@ -389,12 +384,7 @@
"scope": { "scope": {
"type": "string", "type": "string",
"description": "The scope to use for cache keys. Defaults to `buildkit`.\n\nThis should be set if building and caching multiple images in one\nworkflow, otherwise caches will overwrite each other.", "description": "The scope to use for cache keys. Defaults to `buildkit`.\n\nThis should be set if building and caching multiple images in one\nworkflow, otherwise caches will overwrite each other.",
"default": "", "default": "buildkit"
"defaultInfo": {
"environment": [
"buildkit"
]
}
}, },
"token": { "token": {
"type": "string", "type": "string",

2
provider/internal/cache.go
View File

@@ -157,7 +157,7 @@ type CacheFromGitHubActions struct {
func (c *CacheFromGitHubActions) Annotate(a infer.Annotator) { func (c *CacheFromGitHubActions) Annotate(a infer.Annotator) {
a.SetDefault(&c.URL, "", "ACTIONS_CACHE_URL") a.SetDefault(&c.URL, "", "ACTIONS_CACHE_URL")
a.SetDefault(&c.Token, "", "ACTIONS_RUNTIME_TOKEN") a.SetDefault(&c.Token, "", "ACTIONS_RUNTIME_TOKEN")
a.SetDefault(&c.Scope, "", "buildkit") a.SetDefault(&c.Scope, "buildkit")
a.Describe(&c.URL, dedent(` a.Describe(&c.URL, dedent(`
The cache server URL to use for artifacts. The cache server URL to use for artifacts.

2
sdk/dotnet/Inputs/CacheFromGitHubActionsArgs.cs generated
View File

@@ -54,7 +54,7 @@ namespace Pulumi.DockerBuild.Inputs
public CacheFromGitHubActionsArgs() public CacheFromGitHubActionsArgs()
{ {
Scope = Utilities.GetEnv("buildkit") ?? ""; Scope = "buildkit";
Token = Utilities.GetEnv("ACTIONS_RUNTIME_TOKEN") ?? ""; Token = Utilities.GetEnv("ACTIONS_RUNTIME_TOKEN") ?? "";
Url = Utilities.GetEnv("ACTIONS_CACHE_URL") ?? ""; Url = Utilities.GetEnv("ACTIONS_CACHE_URL") ?? "";
} }

2
sdk/dotnet/Inputs/CacheToGitHubActionsArgs.cs generated
View File

@@ -68,7 +68,7 @@ namespace Pulumi.DockerBuild.Inputs
{ {
IgnoreError = false; IgnoreError = false;
Mode = Pulumi.DockerBuild.CacheMode.Min; Mode = Pulumi.DockerBuild.CacheMode.Min;
Scope = Utilities.GetEnv("buildkit") ?? ""; Scope = "buildkit";
Token = Utilities.GetEnv("ACTIONS_RUNTIME_TOKEN") ?? ""; Token = Utilities.GetEnv("ACTIONS_RUNTIME_TOKEN") ?? "";
Url = Utilities.GetEnv("ACTIONS_CACHE_URL") ?? ""; Url = Utilities.GetEnv("ACTIONS_CACHE_URL") ?? "";
} }

20
sdk/go/dockerbuild/pulumiTypes.go generated
View File

@@ -862,10 +862,8 @@ func (val *CacheFromGitHubActions) Defaults() *CacheFromGitHubActions {
} }
tmp := *val tmp := *val
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { scope_ := "buildkit"
scope_ := d.(string) tmp.Scope = &scope_
tmp.Scope = &scope_
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {
@@ -921,9 +919,7 @@ func (val *CacheFromGitHubActionsArgs) Defaults() *CacheFromGitHubActionsArgs {
} }
tmp := *val tmp := *val
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { tmp.Scope = pulumi.StringPtr("buildkit")
tmp.Scope = pulumi.StringPtr(d.(string))
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {
@@ -2405,10 +2401,8 @@ func (val *CacheToGitHubActions) Defaults() *CacheToGitHubActions {
tmp.Mode = &mode_ tmp.Mode = &mode_
} }
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { scope_ := "buildkit"
scope_ := d.(string) tmp.Scope = &scope_
tmp.Scope = &scope_
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {
@@ -2474,9 +2468,7 @@ func (val *CacheToGitHubActionsArgs) Defaults() *CacheToGitHubActionsArgs {
tmp.Mode = CacheMode("min") tmp.Mode = CacheMode("min")
} }
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { tmp.Scope = pulumi.StringPtr("buildkit")
tmp.Scope = pulumi.StringPtr(d.(string))
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {

20
sdk/go/dockerbuild/x/pulumiTypes.go generated
View File

@@ -421,10 +421,8 @@ func (val *CacheFromGitHubActions) Defaults() *CacheFromGitHubActions {
} }
tmp := *val tmp := *val
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { scope_ := "buildkit"
scope_ := d.(string) tmp.Scope = &scope_
tmp.Scope = &scope_
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {
@@ -469,9 +467,7 @@ func (val *CacheFromGitHubActionsArgs) Defaults() *CacheFromGitHubActionsArgs {
} }
tmp := *val tmp := *val
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { tmp.Scope = pulumix.Ptr("buildkit")
tmp.Scope = pulumix.Ptr(d.(string))
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {
@@ -1178,10 +1174,8 @@ func (val *CacheToGitHubActions) Defaults() *CacheToGitHubActions {
tmp.Mode = &mode_ tmp.Mode = &mode_
} }
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { scope_ := "buildkit"
scope_ := d.(string) tmp.Scope = &scope_
tmp.Scope = &scope_
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {
@@ -1236,9 +1230,7 @@ func (val *CacheToGitHubActionsArgs) Defaults() *CacheToGitHubActionsArgs {
tmp.Mode = pulumix.Ptr(CacheMode("min")) tmp.Mode = pulumix.Ptr(CacheMode("min"))
} }
if tmp.Scope == nil { if tmp.Scope == nil {
if d := internal.GetEnvOrDefault("", nil, "buildkit"); d != nil { tmp.Scope = pulumix.Ptr("buildkit")
tmp.Scope = pulumix.Ptr(d.(string))
}
} }
if tmp.Token == nil { if tmp.Token == nil {
if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil { if d := internal.GetEnvOrDefault("", nil, "ACTIONS_RUNTIME_TOKEN"); d != nil {

2
sdk/java/src/main/java/com/pulumi/dockerbuild/inputs/CacheFromGitHubActionsArgs.java generated
View File

@@ -199,7 +199,7 @@ public final class CacheFromGitHubActionsArgs extends com.pulumi.resources.Resou
} }
public CacheFromGitHubActionsArgs build() { public CacheFromGitHubActionsArgs build() {
$.scope = Codegen.stringProp("scope").output().arg($.scope).env("buildkit").def("").getNullable(); $.scope = Codegen.stringProp("scope").output().arg($.scope).def("buildkit").getNullable();
$.token = Codegen.stringProp("token").secret().arg($.token).env("ACTIONS_RUNTIME_TOKEN").def("").getNullable(); $.token = Codegen.stringProp("token").secret().arg($.token).env("ACTIONS_RUNTIME_TOKEN").def("").getNullable();
$.url = Codegen.stringProp("url").output().arg($.url).env("ACTIONS_CACHE_URL").def("").getNullable(); $.url = Codegen.stringProp("url").output().arg($.url).env("ACTIONS_CACHE_URL").def("").getNullable();
return $; return $;

2
sdk/java/src/main/java/com/pulumi/dockerbuild/inputs/CacheToGitHubActionsArgs.java generated
View File

@@ -277,7 +277,7 @@ public final class CacheToGitHubActionsArgs extends com.pulumi.resources.Resourc
public CacheToGitHubActionsArgs build() { public CacheToGitHubActionsArgs build() {
$.ignoreError = Codegen.booleanProp("ignoreError").output().arg($.ignoreError).def(false).getNullable(); $.ignoreError = Codegen.booleanProp("ignoreError").output().arg($.ignoreError).def(false).getNullable();
$.mode = Codegen.objectProp("mode", CacheMode.class).output().arg($.mode).def(CacheMode.Min).getNullable(); $.mode = Codegen.objectProp("mode", CacheMode.class).output().arg($.mode).def(CacheMode.Min).getNullable();
$.scope = Codegen.stringProp("scope").output().arg($.scope).env("buildkit").def("").getNullable(); $.scope = Codegen.stringProp("scope").output().arg($.scope).def("buildkit").getNullable();
$.token = Codegen.stringProp("token").secret().arg($.token).env("ACTIONS_RUNTIME_TOKEN").def("").getNullable(); $.token = Codegen.stringProp("token").secret().arg($.token).env("ACTIONS_RUNTIME_TOKEN").def("").getNullable();
$.url = Codegen.stringProp("url").output().arg($.url).env("ACTIONS_CACHE_URL").def("").getNullable(); $.url = Codegen.stringProp("url").output().arg($.url).env("ACTIONS_CACHE_URL").def("").getNullable();
return $; return $;

4
sdk/nodejs/types/input.ts generated
View File

@@ -136,7 +136,7 @@ export interface CacheFromGitHubActionsArgs {
export function cacheFromGitHubActionsArgsProvideDefaults(val: CacheFromGitHubActionsArgs): CacheFromGitHubActionsArgs { export function cacheFromGitHubActionsArgsProvideDefaults(val: CacheFromGitHubActionsArgs): CacheFromGitHubActionsArgs {
return { return {
...val, ...val,
scope: (val.scope) ?? (utilities.getEnv("buildkit") || ""), scope: (val.scope) ?? "buildkit",
token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""), token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""),
url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""), url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""),
}; };
@@ -345,7 +345,7 @@ export function cacheToGitHubActionsArgsProvideDefaults(val: CacheToGitHubAction
...val, ...val,
ignoreError: (val.ignoreError) ?? false, ignoreError: (val.ignoreError) ?? false,
mode: (val.mode) ?? "min", mode: (val.mode) ?? "min",
scope: (val.scope) ?? (utilities.getEnv("buildkit") || ""), scope: (val.scope) ?? "buildkit",
token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""), token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""),
url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""), url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""),
}; };

4
sdk/nodejs/types/output.ts generated
View File

@@ -136,7 +136,7 @@ export interface CacheFromGitHubActions {
export function cacheFromGitHubActionsProvideDefaults(val: CacheFromGitHubActions): CacheFromGitHubActions { export function cacheFromGitHubActionsProvideDefaults(val: CacheFromGitHubActions): CacheFromGitHubActions {
return { return {
...val, ...val,
scope: (val.scope) ?? (utilities.getEnv("buildkit") || ""), scope: (val.scope) ?? "buildkit",
token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""), token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""),
url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""), url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""),
}; };
@@ -345,7 +345,7 @@ export function cacheToGitHubActionsProvideDefaults(val: CacheToGitHubActions):
...val, ...val,
ignoreError: (val.ignoreError) ?? false, ignoreError: (val.ignoreError) ?? false,
mode: (val.mode) ?? "min", mode: (val.mode) ?? "min",
scope: (val.scope) ?? (utilities.getEnv("buildkit") || ""), scope: (val.scope) ?? "buildkit",
token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""), token: (val.token) ?? (utilities.getEnv("ACTIONS_RUNTIME_TOKEN") || ""),
url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""), url: (val.url) ?? (utilities.getEnv("ACTIONS_CACHE_URL") || ""),
}; };

4
sdk/python/pulumi_docker_build/_inputs.py generated
View File

@@ -332,7 +332,7 @@ class CacheFromGitHubActionsArgs:
environment variable to your jobs. environment variable to your jobs.
""" """
if scope is None: if scope is None:
scope = (_utilities.get_env('buildkit') or '') scope = 'buildkit'
if scope is not None: if scope is not None:
pulumi.set(__self__, "scope", scope) pulumi.set(__self__, "scope", scope)
if token is None: if token is None:
@@ -1048,7 +1048,7 @@ class CacheToGitHubActionsArgs:
if mode is not None: if mode is not None:
pulumi.set(__self__, "mode", mode) pulumi.set(__self__, "mode", mode)
if scope is None: if scope is None:
scope = (_utilities.get_env('buildkit') or '') scope = 'buildkit'
if scope is not None: if scope is not None:
pulumi.set(__self__, "scope", scope) pulumi.set(__self__, "scope", scope)
if token is None: if token is None:

4
sdk/python/pulumi_docker_build/outputs.py generated
View File

@@ -315,7 +315,7 @@ class CacheFromGitHubActions(dict):
environment variable to your jobs. environment variable to your jobs.
""" """
if scope is None: if scope is None:
scope = (_utilities.get_env('buildkit') or '') scope = 'buildkit'
if scope is not None: if scope is not None:
pulumi.set(__self__, "scope", scope) pulumi.set(__self__, "scope", scope)
if token is None: if token is None:
@@ -835,7 +835,7 @@ class CacheToGitHubActions(dict):
if mode is not None: if mode is not None:
pulumi.set(__self__, "mode", mode) pulumi.set(__self__, "mode", mode)
if scope is None: if scope is None:
scope = (_utilities.get_env('buildkit') or '') scope = 'buildkit'
if scope is not None: if scope is not None:
pulumi.set(__self__, "scope", scope) pulumi.set(__self__, "scope", scope)
if token is None: if token is None: