Embed metrics credentials and upload metrics if they are present (#5157)

* statically embed secret into skaffold for release * upload metrics to cloud monitoring * use fake fs for offline unit test
GoogleContainerTools · Dec 17, 2020 · 30e7eab · 30e7eab
1 parent e9c9bdb
commit 30e7eab
Show file tree

Hide file tree

Showing 9 changed files with 378 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ docs/themes
 docs/package-lock.json
 pkg/skaffold/color/debug.test
 cmd/skaffold/app/cmd/statik/statik.go
+cmd/skaffold/app/secret/statik/statik.go
diff --git a/cmd/skaffold/app/cmd/schema/print_test.go b/cmd/skaffold/app/cmd/schema/print_test.go
@@ -18,45 +18,15 @@ package schema
 
 import (
 	"bytes"
-	"io"
 	"net/http"
-	"os"
 	"testing"
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/statik"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
-type fakeFileSystem struct {
-	Files map[string][]byte
-}
-
-type fakeFile struct {
-	http.File
-	content io.Reader
-}
-
-func (f *fakeFileSystem) Open(name string) (http.File, error) {
-	content, found := f.Files[name]
-	if !found {
-		return nil, os.ErrNotExist
-	}
-
-	return &fakeFile{
-		content: bytes.NewBuffer(content),
-	}, nil
-}
-
-func (f *fakeFile) Read(p []byte) (n int, err error) {
-	return f.content.Read(p)
-}
-
-func (f *fakeFile) Close() error {
-	return nil
-}
-
 func TestPrint(t *testing.T) {
-	fs := &fakeFileSystem{
+	fs := &testutil.FakeFileSystem{
 		Files: map[string][]byte{
 			"/schemas/v1.json": []byte("{SCHEMA}"),
 		},

diff --git a/cmd/skaffold/app/secret/statik/fs.go b/cmd/skaffold/app/secret/statik/fs.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 The Skaffold Authors
+
+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 statik
diff --git a/go.mod b/go.mod
@@ -15,8 +15,10 @@ replace (
 
 require (
 	4d63.com/tz v1.1.0
+	cloud.google.com/go v0.72.0 // indirect
 	cloud.google.com/go/storage v1.10.0
 	github.com/AlecAivazis/survey/v2 v2.0.5
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.13.0
 	github.com/Microsoft/go-winio v0.4.15 // indirect
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/bmatcuk/doublestar v1.2.4
@@ -37,7 +39,7 @@ require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
 	github.com/golang/protobuf v1.4.3
-	github.com/google/go-cmp v0.5.2
+	github.com/google/go-cmp v0.5.4
 	github.com/google/go-containerregistry v0.1.4
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible // indirect
@@ -67,15 +69,19 @@ require (
 	github.com/tektoncd/pipeline v0.5.1-0.20190731183258-9d7e37e85bf8
 	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
+	go.opentelemetry.io/otel v0.13.0
+	go.opentelemetry.io/otel/sdk v0.13.0
 	golang.org/x/mod v0.3.0
-	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect
+	golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 	golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211
 	golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
 	gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
-	google.golang.org/api v0.34.0
-	google.golang.org/genproto v0.0.0-20201022181438-0ff5f38871d5
-	google.golang.org/grpc v1.33.1
+	google.golang.org/api v0.35.0
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20201202151023-55d61f90c1ce
+	google.golang.org/grpc v1.33.2
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776

diff --git a/go.sum b/go.sum
diff --git a/hack/generate-statik.sh b/hack/generate-statik.sh
@@ -18,6 +18,7 @@ set -euo pipefail
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+SECRET=${SECRET:-${DIR}/../secrets}
 BIN=${DIR}/bin
 STATIK=${BIN}/statik
 LICENSES=${BIN}/go-licenses
@@ -54,3 +55,8 @@ if ! [[ -f ${STATIK} ]]; then
 fi
 
 ${STATIK} -f -src=${TMP_DIR} -m -dest cmd/skaffold/app/cmd
+
+if [[ -d ${SECRET} ]]; then
+   echo "generating statik for secret"
+   ${STATIK} -f -src=${SECRET} -m -dest cmd/skaffold/app/secret
+fi