From e2d7a06e9fd53565691654651b9bfc80ed57f76f Mon Sep 17 00:00:00 2001 From: jregan Date: Sun, 20 Oct 2019 11:43:04 -0700 Subject: [PATCH] Make inventory public. --- {pkg => api}/inventory/constants.go | 0 {pkg => api}/inventory/inventory.go | 0 {pkg => api}/inventory/inventory_test.go | 20 ++++--------------- plugin/builtin/InventoryTransformer.go | 2 +- .../InventoryTransformer.go | 2 +- 5 files changed, 6 insertions(+), 18 deletions(-) rename {pkg => api}/inventory/constants.go (100%) rename {pkg => api}/inventory/inventory.go (100%) rename {pkg => api}/inventory/inventory_test.go (70%) diff --git a/pkg/inventory/constants.go b/api/inventory/constants.go similarity index 100% rename from pkg/inventory/constants.go rename to api/inventory/constants.go diff --git a/pkg/inventory/inventory.go b/api/inventory/inventory.go similarity index 100% rename from pkg/inventory/inventory.go rename to api/inventory/inventory.go diff --git a/pkg/inventory/inventory_test.go b/api/inventory/inventory_test.go similarity index 70% rename from pkg/inventory/inventory_test.go rename to api/inventory/inventory_test.go index 6f1700896..9b8a423a7 100644 --- a/pkg/inventory/inventory_test.go +++ b/api/inventory/inventory_test.go @@ -1,24 +1,12 @@ -/* -Copyright 2019 The Kubernetes Authors. +// Copyright 2019 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package inventory +package inventory_test import ( "testing" + . "sigs.k8s.io/kustomize/v3/api/inventory" "sigs.k8s.io/kustomize/v3/api/resid" ) diff --git a/plugin/builtin/InventoryTransformer.go b/plugin/builtin/InventoryTransformer.go index 486fbb79f..32edf52df 100644 --- a/plugin/builtin/InventoryTransformer.go +++ b/plugin/builtin/InventoryTransformer.go @@ -5,12 +5,12 @@ import ( "fmt" "sigs.k8s.io/kustomize/v3/api/hasher" + "sigs.k8s.io/kustomize/v3/api/inventory" "sigs.k8s.io/kustomize/v3/api/kv" "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/inventory" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go index f15bf5980..f5c4217a5 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go @@ -8,12 +8,12 @@ import ( "fmt" "sigs.k8s.io/kustomize/v3/api/hasher" + "sigs.k8s.io/kustomize/v3/api/inventory" "sigs.k8s.io/kustomize/v3/api/kv" "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/inventory" "sigs.k8s.io/yaml" )