Skip to content

pkg/cli/admin/release/extract_tools: Drop AsArchive from extractTarget #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wking wants to merge 1 commit into from
Closed

pkg/cli/admin/release/extract_tools: Drop AsArchive from extractTarget #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions pkg/cli/admin/release/extract_tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type extractTarget struct {
InjectReleaseVersion bool

ArchiveFormat string
AsArchive bool
AsZip bool
Readme string
LinkTo []string
Expand Down Expand Up @@ -234,12 +233,7 @@ func (o *ExtractOptions) extractCommand(command string) error {

// If the user didn't specify a command, or the operating system is set
// to '*', we'll produce an archive
if len(command) == 0 || o.CommandOperatingSystem == "*" {
for i := range targets {
targets[i].AsArchive = true
targets[i].AsZip = targets[i].OS == "windows"
}
}
asArchive := len(command) == 0 || o.CommandOperatingSystem == "*"

if len(targets) == 0 {
switch {
Expand Down Expand Up @@ -324,7 +318,7 @@ func (o *ExtractOptions) extractCommand(command string) error {
}
target.Mapping.Image = spec
target.Mapping.ImageRef = imagesource.TypedImageReference{Ref: ref, Type: imagesource.DestinationRegistry}
if target.AsArchive {
if asArchive {
willArchive = true
target.Mapping.Name = fmt.Sprintf(target.ArchiveFormat, releaseName)
target.Mapping.To = filepath.Join(dir, target.Mapping.Name)
Expand Down Expand Up @@ -393,7 +387,7 @@ func (o *ExtractOptions) extractCommand(command string) error {

var hash hash.Hash
closeFn := func() error { return nil }
if target.AsArchive {
if asArchive {
text := strings.Replace(target.Readme, `\u0060`, "`", -1)
hash = hashFn()
w = io.MultiWriter(hash, w)
Expand Down