Rename internal registry service pkg

nywilken · nywilken · commit 4bfe2bf4f218 · 2021-09-02T20:59:56.000-04:00
diff --git a/command/core_wrapper.go b/command/core_wrapper.go
@@ -2,7 +2,7 @@ package command
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 	"github.com/hashicorp/packer/packer"
 	plugingetter "github.com/hashicorp/packer/packer/plugin-getter"
 )
diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer/builder/null"
 	. "github.com/hashicorp/packer/hcl2template/internal"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 	"github.com/hashicorp/packer/packer"
 	"github.com/zclconf/go-cty/cty"
 )
diff --git a/hcl2template/registry.go b/hcl2template/registry.go
@@ -2,7 +2,7 @@ package hcl2template
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 )
 
 // ConfiguredArtifactMetadataPublisher returns a configured image bucket that can be used for publishing
diff --git a/hcl2template/types.build.go b/hcl2template/types.build.go
@@ -6,8 +6,8 @@ import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/gohcl"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
-	"github.com/hashicorp/packer/internal/packer_registry/env"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
+	"github.com/hashicorp/packer/internal/registry/env"
 )
 
 const (
diff --git a/hcl2template/types.build.hcp_packer_registry.go b/hcl2template/types.build.hcp_packer_registry.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/gohcl"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 )
 
 type HCPPackerRegistryBlock struct {
diff --git a/hcl2template/types.build.hcp_packer_registry_test.go b/hcl2template/types.build.hcp_packer_registry_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer/internal/packer_registry"
+	packer_registry "github.com/hashicorp/packer/internal/registry"
 	"github.com/hashicorp/packer/packer"
 )
 
diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	pkrfunction "github.com/hashicorp/packer/hcl2template/function"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 	"github.com/hashicorp/packer/packer"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
diff --git a/internal/registry/client.go b/internal/registry/client.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	projectSvc "github.com/hashicorp/hcp-sdk-go/clients/cloud-resource-manager/preview/2019-12-10/client/project_service"
 	rmmodels "github.com/hashicorp/hcp-sdk-go/clients/cloud-resource-manager/preview/2019-12-10/models"
 	"github.com/hashicorp/hcp-sdk-go/httpclient"
-	"github.com/hashicorp/packer/internal/packer_registry/env"
+	"github.com/hashicorp/packer/internal/registry/env"
 )
 
 // Client is an HCP client capable of making requests on behalf of a service principal
diff --git a/internal/registry/env/env.go b/internal/registry/env/env.go
diff --git a/internal/registry/env/env_test.go b/internal/registry/env/env_test.go
diff --git a/internal/registry/env/variables.go b/internal/registry/env/variables.go
diff --git a/internal/registry/errors.go b/internal/registry/errors.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"fmt"
diff --git a/internal/registry/mock_service.go b/internal/registry/mock_service.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"errors"
diff --git a/internal/registry/service.go b/internal/registry/service.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"context"
diff --git a/internal/registry/types.bucket.go b/internal/registry/types.bucket.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/hcp-sdk-go/clients/cloud-packer-service/preview/2021-04-30/models"
 	registryimage "github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
-	"github.com/hashicorp/packer/internal/packer_registry/env"
+	"github.com/hashicorp/packer/internal/registry/env"
 	"google.golang.org/grpc/codes"
 )
 
diff --git a/internal/registry/types.bucket_test.go b/internal/registry/types.bucket_test.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"context"
diff --git a/internal/registry/types.builds.go b/internal/registry/types.builds.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"github.com/hashicorp/hcp-sdk-go/clients/cloud-packer-service/preview/2021-04-30/models"
diff --git a/internal/registry/types.iterations.go b/internal/registry/types.iterations.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"errors"
diff --git a/internal/registry/types.iterations_test.go b/internal/registry/types.iterations_test.go
@@ -1,4 +1,4 @@
-package packer_registry
+package registry
 
 import (
 	"os"
diff --git a/packer/core.go b/packer/core.go
@@ -19,8 +19,8 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
-	"github.com/hashicorp/packer/internal/packer_registry/env"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
+	"github.com/hashicorp/packer/internal/registry/env"
 	packerversion "github.com/hashicorp/packer/version"
 )
 
diff --git a/packer/registry_builder.go b/packer/registry_builder.go
@@ -9,7 +9,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	registryimage "github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 )
 
 type RegistryBuilder struct {
@@ -71,11 +71,14 @@ func (b *RegistryBuilder) Run(ctx context.Context, ui packersdk.Ui, hook packers
 
 	state := artifact.State(registryimage.ArtifactStateURI)
 	var images []registryimage.Image
-	config.Decode(&images, &config.DecodeOpts{}, state)
+	err = config.Decode(&images, &config.DecodeOpts{}, state)
+	if err != nil {
+		return artifact, fmt.Errorf("failed to obtain HCP Packer registry image from build artifact: %w", err)
+	}
+
 	err = b.ArtifactMetadataPublisher.UpdateImageForBuild(b.Name, images...)
 	if err != nil {
-		log.Printf("[TRACE] failed to add image artifact for %q: %s", b.Name, err)
-		return artifact, err
+		return artifact, fmt.Errorf("failed to add image artifact for %q: %s", b.Name, err)
 	}
 
 	return artifact, nil
diff --git a/packer/registry_post_processor.go b/packer/registry_post_processor.go
@@ -10,7 +10,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	registryimage "github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 )
 
 type RegistryPostProcessor struct {
@@ -63,12 +63,14 @@ func (p *RegistryPostProcessor) PostProcess(ctx context.Context, ui packersdk.Ui
 
 	state := source.State(registryimage.ArtifactStateURI)
 	var images []registryimage.Image
-	config.Decode(&images, &config.DecodeOpts{}, state)
+	err = config.Decode(&images, &config.DecodeOpts{}, state)
+	if err != nil {
+		return source, false, false, fmt.Errorf("failed to obtain HCP Packer registry image from post-processor artifact: %w", err)
+	}
 	err = p.ArtifactMetadataPublisher.UpdateImageForBuild(p.BuilderType, images...)
 
 	if err != nil {
-		log.Printf("[TRACE] failed to add image artifact for %q: %s", p.BuilderType, err)
-		return source, keep, override, err
+		return source, keep, override, fmt.Errorf("[TRACE] failed to add image artifact for %q: %s", p.BuilderType, err)
 	}
 
 	return source, keep, override, nil
diff --git a/packer/run_interfaces.go b/packer/run_interfaces.go
@@ -3,7 +3,7 @@ package packer
 import (
 	"github.com/hashicorp/hcl/v2"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	packerregistry "github.com/hashicorp/packer/internal/packer_registry"
+	packerregistry "github.com/hashicorp/packer/internal/registry"
 	plugingetter "github.com/hashicorp/packer/packer/plugin-getter"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package command`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/hashicorp/hcl/v2"`
`5`		`- packerregistry "github.com/hashicorp/packer/internal/packer_registry"`
	`5`	`+ packerregistry "github.com/hashicorp/packer/internal/registry"`
`6`	`6`	`"github.com/hashicorp/packer/packer"`
`7`	`7`	`plugingetter "github.com/hashicorp/packer/packer/plugin-getter"`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"github.com/hashicorp/packer-plugin-sdk/template/config"`
`14`	`14`	`"github.com/hashicorp/packer/builder/null"`
`15`	`15`	`. "github.com/hashicorp/packer/hcl2template/internal"`
`16`		`- packerregistry "github.com/hashicorp/packer/internal/packer_registry"`
	`16`	`+ packerregistry "github.com/hashicorp/packer/internal/registry"`
`17`	`17`	`"github.com/hashicorp/packer/packer"`
`18`	`18`	`"github.com/zclconf/go-cty/cty"`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package hcl2template`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/hashicorp/hcl/v2"`
`5`		`- packerregistry "github.com/hashicorp/packer/internal/packer_registry"`
	`5`	`+ packerregistry "github.com/hashicorp/packer/internal/registry"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// ConfiguredArtifactMetadataPublisher returns a configured image bucket that can be used for publishing`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/hashicorp/hcl/v2"`
`7`	`7`	`"github.com/hashicorp/hcl/v2/gohcl"`
`8`		`- packerregistry "github.com/hashicorp/packer/internal/packer_registry"`
	`8`	`+ packerregistry "github.com/hashicorp/packer/internal/registry"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type HCPPackerRegistryBlock struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`packersdk "github.com/hashicorp/packer-plugin-sdk/packer"`
`8`		`- "github.com/hashicorp/packer/internal/packer_registry"`
	`8`	`+ packer_registry "github.com/hashicorp/packer/internal/registry"`
`9`	`9`	`"github.com/hashicorp/packer/packer"`
`10`	`10`	`)`
`11`	`11`