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

Fix import names

Browse Source
This commit is contained in:
Bryce Lampe
2024-04-26 12:24:18 -07:00
parent f2e43df5af
commit 66f98e5aa2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
provider/internal/cli.go
View File

@@ -40,7 +40,7 @@ import (
"github.com/regclient/regclient/config" "github.com/regclient/regclient/config"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
goprovider "github.com/pulumi/pulumi-go-provider" provider "github.com/pulumi/pulumi-go-provider"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
@@ -171,18 +171,18 @@ func (c *cli) tail(ctx context.Context) {
s := bufio.NewScanner(c.r) s := bufio.NewScanner(c.r)
for s.Scan() { for s.Scan() {
text := s.Text() text := s.Text()
goprovider.GetLogger(ctx).InfoStatus(text) provider.GetLogger(ctx).InfoStatus(text)
_, _ = b.WriteString(text + "\n") _, _ = b.WriteString(text + "\n")
} }
goprovider.GetLogger(ctx).InfoStatus("") // clear confusing "DONE" statements. provider.GetLogger(ctx).InfoStatus("") // clear confusing "DONE" statements.
if c.dumplogs { if c.dumplogs {
// Persist the full Docker output on error for easier debugging. // Persist the full Docker output on error for easier debugging.
if b.Len() > 0 { if b.Len() > 0 {
goprovider.GetLogger(ctx).Info(b.String()) provider.GetLogger(ctx).Info(b.String())
} }
if c.err.Len() > 0 { if c.err.Len() > 0 {
goprovider.GetLogger(ctx).Error(c.err.String()) provider.GetLogger(ctx).Error(c.err.String())
} }
} }
} }

8
provider/internal/client.go
View File

@@ -44,7 +44,7 @@ import (
"github.com/regclient/regclient/types/manifest" "github.com/regclient/regclient/types/manifest"
"github.com/regclient/regclient/types/ref" "github.com/regclient/regclient/types/ref"
goprovider "github.com/pulumi/pulumi-go-provider" provider "github.com/pulumi/pulumi-go-provider"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
@@ -132,7 +132,7 @@ func (c *cli) Build(
for _, d := range w.Detail { for _, d := range w.Detail {
fmt.Fprintf(b, "\n%s", d) fmt.Fprintf(b, "\n%s", d)
} }
goprovider.GetLogger(ctx).Warning(b.String()) provider.GetLogger(ctx).Warning(b.String())
} }
}() }()
@@ -269,7 +269,7 @@ func (c *cli) ManifestCreate(ctx context.Context, push bool, target string, refs
cmd.SetErr(c.Err()) cmd.SetErr(c.Err())
cmd.SetOut(c.Out()) cmd.SetOut(c.Out())
goprovider.GetLogger(ctx).Debug(fmt.Sprint("creating manifest with args", args)) provider.GetLogger(ctx).Debug(fmt.Sprint("creating manifest with args", args))
return cmd.ExecuteContext(ctx) return cmd.ExecuteContext(ctx)
} }
@@ -299,7 +299,7 @@ func (c *cli) ManifestDelete(ctx context.Context, target string) error {
err = rc.ManifestDelete(ctx, ref) err = rc.ManifestDelete(ctx, ref)
if errors.Is(err, errs.ErrHTTPStatus) { if errors.Is(err, errs.ErrHTTPStatus) {
goprovider.GetLogger(ctx).Warning("this registry does not support deletions") provider.GetLogger(ctx).Warning("this registry does not support deletions")
return nil return nil
} }
if err != nil { if err != nil {