Fix lint and import cycle

Signed-off-by: Natalie Arellano <narellano@vmware.com>
Signed-off-by: cgoxo <goelchitresh13@gmail.com>

Author: Natalie Arellano

pkg/dist/buildpack_descriptor.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/buildpacks/pack/internal/stringset"
 	"github.com/buildpacks/pack/internal/style"
-	"github.com/buildpacks/pack/pkg/buildpack"
 )
 
 type BuildpackDescriptor struct {
@@ -52,7 +51,7 @@ func (b *BuildpackDescriptor) EnsureStackSupport(stackID string, providedMixins
 }
 
 func (b *BuildpackDescriptor) Kind() string {
-	return buildpack.KindBuildpack
+	return "buildpack"
 }
 
 func (b *BuildpackDescriptor) API() *api.Version {

pkg/dist/buildpack_descriptor_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/sclevine/spec"
 	"github.com/sclevine/spec/report"
 
+	"github.com/buildpacks/pack/pkg/buildpack"
 	"github.com/buildpacks/pack/pkg/dist"
 	h "github.com/buildpacks/pack/testhelpers"
 )
@@ -152,7 +153,7 @@ func testBuildpackDescriptor(t *testing.T, when spec.G, it spec.S) {
 	when("#Kind", func() {
 		it("returns 'buildpack'", func() {
 			bpDesc := dist.BuildpackDescriptor{}
-			h.AssertEq(t, bpDesc.Kind(), "buildpack")
+			h.AssertEq(t, bpDesc.Kind(), buildpack.KindBuildpack)
 		})
 	})
 

pkg/dist/extension_descriptor.go

@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	"github.com/buildpacks/lifecycle/api"
-	"github.com/buildpacks/pack/pkg/buildpack"
 )
 
 type ExtensionDescriptor struct {
@@ -21,7 +20,7 @@ func (e *ExtensionDescriptor) EscapedID() string {
 }
 
 func (e *ExtensionDescriptor) Kind() string {
-	return buildpack.KindExtension
+	return "extension"
 }
 
 func (e *ExtensionDescriptor) API() *api.Version {

pkg/dist/extension_descriptor_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/sclevine/spec"
 	"github.com/sclevine/spec/report"
 
+	"github.com/buildpacks/pack/pkg/buildpack"
 	"github.com/buildpacks/pack/pkg/dist"
 	h "github.com/buildpacks/pack/testhelpers"
 )
@@ -31,7 +32,7 @@ func testExtensionDescriptor(t *testing.T, when spec.G, it spec.S) {
 	when("#Kind", func() {
 		it("returns 'extension'", func() {
 			extDesc := dist.ExtensionDescriptor{}
-			h.AssertEq(t, extDesc.Kind(), "extension")
+			h.AssertEq(t, extDesc.Kind(), buildpack.KindExtension)
 		})
 	})