mirror of
https://github.com/ko-build/ko.git
synced 2025-07-12 23:50:31 +02:00
Enable embedding of ko publish (#348)
- Export functions and a variable to enable embedding of ko's `publish` functionality to be embedded in other tools. See https://github.com/GoogleContainerTools/skaffold/pull/5611 - Remove DockerRepo PublishOption and flag. This removes the `DockerRepo` config option and `--docker-repo` flag from the PR. New PR with the extracted config option: https://github.com/google/ko/pull/351 - Fix copyright headers for boilerplate check. - Use DockerRepo PublishOption instead of env var. - Override defaultBaseImage using BuildOptions. Remove exported package global SetDefaultBaseImage and instead allow programmatic override of the default base image using the field `BaseImage` in `options.BuildOptions`. Also fix copyright header years. - Add BuildOptions parameter to getBaseImage This enables access to BaseImage for programmatically overriding the default base image from `.ko.yaml`. - Add UserAgent to BuildOptions and PublishOptions This enables programmatically overriding the `User-Agent` HTTP request header for both pulling the base image and pushing the built image. - Rename MakeBuilder to NewBuilder and MakePublisher to NewPublisher. For more idiomatic constructor function names.
This commit is contained in:
@ -1,16 +1,18 @@
|
||||
// Copyright 2018 Google LLC All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
/*
|
||||
Copyright 2018 Google LLC All Rights Reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package commands
|
||||
|
||||
@ -20,12 +22,14 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
"github.com/google/go-cmp/cmp/cmpopts"
|
||||
"github.com/google/go-containerregistry/pkg/name"
|
||||
v1 "github.com/google/go-containerregistry/pkg/v1"
|
||||
"github.com/google/go-containerregistry/pkg/v1/empty"
|
||||
"github.com/google/go-containerregistry/pkg/v1/random"
|
||||
"github.com/google/ko/pkg/build"
|
||||
"github.com/google/ko/pkg/commands/options"
|
||||
@ -134,6 +138,52 @@ kind: Bar
|
||||
}
|
||||
}
|
||||
|
||||
func TestMakeBuilder(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
bo := &options.BuildOptions{
|
||||
ConcurrentBuilds: 1,
|
||||
}
|
||||
builder, err := NewBuilder(ctx, bo)
|
||||
if err != nil {
|
||||
t.Fatalf("MakeBuilder(): %v", err)
|
||||
}
|
||||
res, err := builder.Build(ctx, "ko://github.com/google/ko/test")
|
||||
if err != nil {
|
||||
t.Fatalf("builder.Build(): %v", err)
|
||||
}
|
||||
gotDigest, err := res.Digest()
|
||||
if err != nil {
|
||||
t.Fatalf("res.Digest(): %v", err)
|
||||
}
|
||||
fmt.Println(gotDigest.String())
|
||||
}
|
||||
|
||||
func TestMakePublisher(t *testing.T) {
|
||||
repo := "registry.example.com/repository"
|
||||
po := &options.PublishOptions{
|
||||
DockerRepo: repo,
|
||||
PreserveImportPaths: true,
|
||||
}
|
||||
publisher, err := NewPublisher(po)
|
||||
if err != nil {
|
||||
t.Fatalf("MakePublisher(): %v", err)
|
||||
}
|
||||
defer publisher.Close()
|
||||
ctx := context.Background()
|
||||
importpath := "github.com/google/ko/test"
|
||||
importpathWithScheme := build.StrictScheme + importpath
|
||||
buildResult := empty.Index
|
||||
ref, err := publisher.Publish(ctx, buildResult, importpathWithScheme)
|
||||
if err != nil {
|
||||
t.Fatalf("publisher.Publish(): %v", err)
|
||||
}
|
||||
gotImageName := ref.Context().Name()
|
||||
wantImageName := strings.ToLower(fmt.Sprintf("%s/%s", repo, importpath))
|
||||
if gotImageName != wantImageName {
|
||||
t.Errorf("got %s, wanted %s", gotImageName, wantImageName)
|
||||
}
|
||||
}
|
||||
|
||||
func mustRepository(s string) name.Repository {
|
||||
n, err := name.NewRepository(s)
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user