Skip to content
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

Remove templates #98

Merged
merged 5 commits into from
Jan 8, 2024
Merged

Remove templates #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b5bb8c
chore: fix nil pointer
moshloop Jan 2, 2024
8eff3ca
feat: remove templating functions in favor of gomplate
moshloop Jan 8, 2024
670ea2b
feat: add option to set logger impl
moshloop Jan 8, 2024
191f53c
chore: test fixes
moshloop Jan 8, 2024
06772cd
chore: bump otel
moshloop Jan 8, 2024
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
7 changes: 4 additions & 3 deletions context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/noop"
)

var (
noopTracer = trace.NewNoopTracerProvider().Tracer("noop")
noopTracer = noop.NewTracerProvider().Tracer("noop")
)

type ContextOptions func(*Context)
Expand Down Expand Up @@ -136,11 +137,11 @@ func (c Context) WithTimeout(timeout time.Duration) (Context, gocontext.CancelFu
}

func (c Context) IsDebug() bool {
return (c.debug != nil && *c.debug) || c.isDebugFn(c)
return (c.debug != nil && *c.debug) || (c.isDebugFn != nil && c.isDebugFn(c))
}

func (c Context) IsTrace() bool {
return (c.trace != nil && *c.trace) || c.isTraceFn(c)
return (c.trace != nil && *c.trace) || (c.isTraceFn != nil && c.isTraceFn(c))
}

func (c Context) Debugf(format string, args ...interface{}) {
Expand Down
31 changes: 22 additions & 9 deletions deps/deps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package deps

import (
"bytes"
"fmt"
"os"
"path"
"runtime"
"strings"

gotemplate "text/template"

osExec "os/exec"

"github.com/flanksource/commons/exec"
"github.com/flanksource/commons/files"
"github.com/flanksource/commons/is"
"github.com/flanksource/commons/net"
"github.com/flanksource/commons/text"
"github.com/flanksource/commons/utils"
log "github.com/sirupsen/logrus"
)
Expand All @@ -37,7 +39,7 @@ type BinaryFuncWithEnv func(msg string, env map[string]string, args ...interface
func (dependency *Dependency) GetPath(name string, binDir string) (string, error) {
data := map[string]string{"os": runtime.GOOS, "platform": runtime.GOARCH, "version": dependency.Version}
if dependency.BinaryName != "" {
templated, err := text.Template(dependency.BinaryName, data)
templated, err := template(dependency.BinaryName, data)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -107,10 +109,6 @@ var dependencies = map[string]Dependency{
Version: "0.55.1",
Template: "https://github.com/vmware-tanzu/sonobuoy/releases/download/v{{.version}}/sonobuoy_{{.version}}_{{.os}}_{{.platform}}.tar.gz",
},
"govc": {
Version: "v0.27.4",
Template: "https://github.com/vmware/govmomi/releases/download/{{.version}}/govc_{{.os | title}}_{{ ternary \"x86_64\" \"armv6\" (eq .platform \"amd64\")}}.tar.gz",
},
"gojsontoyaml": {
Version: "0.15.0",
Linux: "https://github.com/hongkailiu/gojsontoyaml/releases/download/e8bd32d/gojsontoyaml",
Expand Down Expand Up @@ -268,13 +266,13 @@ func InstallDependency(name, ver string, binDir string) error {

data := map[string]string{"os": runtime.GOOS, "platform": runtime.GOARCH, "version": ver}
if urlPath == "" && dependency.Template != "" {
urlPath, err = text.Template(dependency.Template, data)
urlPath, err = template(dependency.Template, data)
if err != nil {
return err
}
}
if urlPath != "" {
url, err := text.Template(urlPath, data)
url, err := template(urlPath, data)
if err != nil {
return err
}
Expand All @@ -288,7 +286,7 @@ func InstallDependency(name, ver string, binDir string) error {
}
} else if dependency.Go != "" {
//FIXME this only works if the PWD is in the GOPATH
url, _ := text.Template(dependency.Go, data)
url, _ := template(dependency.Go, data)
log.Infof("Installing via go get %s (%s) -> %s", name, ver, url)
if err := exec.Execf("GOPATH=$PWD/.go go get %s", url); err != nil {
return err
Expand Down Expand Up @@ -375,3 +373,18 @@ func Which(cmd string) bool {
_, err := osExec.LookPath(cmd)
return err == nil
}

func template(template string, vars map[string]string) (string, error) {
tpl := gotemplate.New("")

tpl, err := tpl.Parse(template)

if err != nil {
return "", fmt.Errorf("invalid template %s: %v", strings.Split(template, "\n")[0], err)
}
var buf bytes.Buffer
if err := tpl.Execute(&buf, vars); err != nil {
return "", fmt.Errorf("error executing template %s: %v", strings.Split(template, "\n")[0], err)
}
return buf.String(), nil
}
80 changes: 37 additions & 43 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,48 @@ module github.com/flanksource/commons
go 1.20

require (
github.com/antonmedv/expr v1.12.5
github.com/dustin/go-humanize v1.0.1
github.com/flanksource/gomplate/v3 v3.20.4
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/hashicorp/go-getter v1.7.1
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.5.0
github.com/hashicorp/go-getter v1.7.3
github.com/henvic/httpretty v0.1.2
github.com/kr/pretty v0.3.1
github.com/mitchellh/reflectwalk v1.0.2
github.com/onsi/gomega v1.27.6
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/tidwall/gjson v1.14.4
github.com/ulikunitz/xz v0.5.11
github.com/vadimi/go-http-ntlm v1.0.3
github.com/vadimi/go-http-ntlm/v2 v2.4.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
go.uber.org/zap v1.24.0
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0
go.opentelemetry.io/otel/sdk v1.21.0
go.opentelemetry.io/otel/trace v1.21.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.17.0
golang.org/x/oauth2 v0.13.0
golang.org/x/sync v0.2.0
golang.org/x/oauth2 v0.15.0
golang.org/x/sync v0.6.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/flanksource/yaml.v3 v3.2.3
)

require (
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go v0.111.0 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.0 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/storage v1.36.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/aws/aws-sdk-go v1.44.234 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/aws/aws-sdk-go v1.49.16 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/flanksource/gomplate/v3 v3.20.4 // indirect
github.com/flanksource/is-healthy v0.0.0-20230713150444-ad2a5ef4bb37 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -58,9 +53,9 @@ require (
github.com/google/cel-go v0.17.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gosimple/slug v1.13.1 // indirect
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/hairyhenderson/toml v0.4.2-0.20210923231440-40456b8e66cf // indirect
Expand All @@ -72,38 +67,37 @@ require (
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/robertkrimen/otto v0.2.1 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/vadimi/go-ntlm v1.2.1 // indirect
github.com/yuin/gopher-lua v1.1.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.2.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.126.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.155.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/grpc v1.60.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading
Loading