move version and useragent definitions into sdk

This commit is contained in:
Megan Marsh 2020-11-18 11:40:06 -08:00
parent 9e47696dff
commit f8f1ebf0c7
88 changed files with 86 additions and 86 deletions

View File

@ -123,7 +123,7 @@ generate: install-gen-deps ## Generate dynamically generated code
@echo "==> removing autogenerated markdown..."
@find website/pages/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm -f
@echo "==> removing autogenerated code..."
@find post-processor packer-plugin-sdk helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
@find post-processor packer-plugin-sdk helper builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
go generate ./...
go fmt packer-plugin-sdk/bootcommand/boot_command.go
go run ./cmd/generate-fixer-deprecations

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -23,7 +23,7 @@ import (
"github.com/Azure/go-autorest/autorest/azure"
"github.com/hashicorp/packer/builder/azure/common"
"github.com/hashicorp/packer/builder/azure/version"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
)
const (

View File

@ -6,7 +6,7 @@ import (
"regexp"
"time"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute/computeapi"

View File

@ -16,7 +16,7 @@ import (
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/autorest/to"
version "github.com/hashicorp/packer/builder/azure/version"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
)
var (

View File

@ -21,7 +21,7 @@ import (
"github.com/Azure/go-autorest/autorest/azure"
"github.com/hashicorp/packer/builder/azure/common"
"github.com/hashicorp/packer/builder/azure/version"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
)
const (

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -18,9 +18,9 @@ import (
oslogin "google.golang.org/api/oslogin/v1"
"github.com/hashicorp/packer/builder/googlecompute/version"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer"
"github.com/hashicorp/packer/packer-plugin-sdk/retry"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
vaultapi "github.com/hashicorp/vault/api"
"golang.org/x/oauth2"

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -11,11 +11,11 @@ import (
"github.com/hashicorp/packer/builder/scaleway/version"
"github.com/hashicorp/packer/helper/communicator"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer"
"github.com/hashicorp/packer/packer-plugin-sdk/common"
"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
"github.com/mitchellh/mapstructure"
"github.com/scaleway/scaleway-sdk-go/api/instance/v1"

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -8,8 +8,8 @@ import (
"time"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"github.com/hashicorp/packer/helper/useragent"
"github.com/hashicorp/packer/packer"
"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -63,8 +63,8 @@ func main() {
}
}
deprecated_path := filepath.Join(packerDir, "helper", "config",
"deprecated_options.go")
deprecated_path := filepath.Join(packerDir, "packer-plugin-sdk", "template",
"config", "deprecated_options.go")
buf := bytes.Buffer{}

View File

@ -490,7 +490,7 @@ func getMapstructureSquashedStruct(topPkg *types.Package, utStruct *types.Struct
switch f.String() {
case "time.Duration":
field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.String]), field.Embedded())
case "github.com/hashicorp/packer/helper/config.Trilean": // TODO(azr): unhack this situation
case "github.com/hashicorp/packer/packer-plugin-sdk/template/config.Trilean": // TODO(azr): unhack this situation
field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.Bool]), field.Embedded())
case "github.com/hashicorp/packer/provisioner/powershell.ExecutionPolicy": // TODO(azr): unhack this situation
field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.String]), field.Embedded())

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -1,7 +1,7 @@
package version
import (
"github.com/hashicorp/packer/helper/version"
"github.com/hashicorp/packer/packer-plugin-sdk/version"
packerVersion "github.com/hashicorp/packer/version"
)

View File

@ -2,7 +2,7 @@ package version
import (
"github.com/hashicorp/go-version"
pluginVersion "github.com/hashicorp/packer/helper/version"
pluginVersion "github.com/hashicorp/packer/packer-plugin-sdk/version"
)
// The git commit that was compiled. This will be filled in by the compiler.