Merge pull request #83 from RiRa12621/master

adjust all references to osd-utils-cli into osdctl

Dockerfile

@@ -5,7 +5,7 @@ COPY . .
 RUN make build
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
-LABEL io.openshift.managed.name="osd-utils-cli" \
+LABEL io.openshift.managed.name="osdctl" \
       io.openshift.managed.description="OSD related command line utilities"
 
 COPY --from=0 /src/bin/osdctl /bin/osdctl

README.md

@@ -18,7 +18,7 @@ Currently, it mainly supports related work for AWS, especially [aws-account-oper
 - make
 
 ``` bash
-git clone https://github.com/openshift/osd-utils-cli.git
+git clone https://github.com/openshift/osdctl.git
 make build
 ```
 

cmd/account/clean-velero-snapshots.go

@@ -7,8 +7,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	"github.com/openshift/osdctl/cmd/common"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 const (

cmd/account/cli.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
-	k8spkg "github.com/openshift/osd-utils-cli/pkg/k8s"
+	k8spkg "github.com/openshift/osdctl/pkg/k8s"
 )
 
 // newCmdCli implements the Cli command which generates temporary STS cli credentials for the specified account cr

cmd/account/cmd.go

@@ -4,9 +4,9 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/openshift/osd-utils-cli/cmd/account/get"
-	"github.com/openshift/osd-utils-cli/cmd/account/list"
-	"github.com/openshift/osd-utils-cli/cmd/account/servicequotas"
+	"github.com/openshift/osdctl/cmd/account/get"
+	"github.com/openshift/osdctl/cmd/account/list"
+	"github.com/openshift/osdctl/cmd/account/servicequotas"
 )
 
 // NewCmdAccount implements the base account command

cmd/account/console.go

@@ -9,8 +9,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
-	k8spkg "github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	k8spkg "github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 // newCmdConsole implements the Console command which Consoles the specified account cr

cmd/account/generate-secret.go

@@ -18,9 +18,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 // newCmdGenerateSecret implements the generate-secret command which generates an new set of IAM User credentials

cmd/account/get/account-claim.go

@@ -11,9 +11,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	"github.com/openshift/osd-utils-cli/pkg/printer"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/printer"
 )
 
 // newCmdGetAccountClaim implements the get account-claim command which get

cmd/account/get/account.go

@@ -11,9 +11,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	"github.com/openshift/osd-utils-cli/pkg/printer"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/printer"
 )
 
 // newCmdGetAccount implements the get account command which get the Account CR

cmd/account/get/id.go

@@ -12,8 +12,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
 )
 
 // newCmdGetAWSAccount implements the reset command which resets the specified account cr

cmd/account/get/legal-entity.go

@@ -11,9 +11,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	"github.com/openshift/osd-utils-cli/pkg/printer"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/printer"
 )
 
 // newCmdGetLegalEntity implements the get legal-entity command which get

cmd/account/get/secrets.go

@@ -14,8 +14,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
 )
 
 const (

cmd/account/list/account-claim.go

@@ -10,8 +10,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	"github.com/openshift/osd-utils-cli/pkg/printer"
+	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/printer"
 )
 
 // newCmdListAccount implements the list account command to list account claim crs

cmd/account/list/account.go

@@ -13,9 +13,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	"github.com/openshift/osd-utils-cli/pkg/printer"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/printer"
 )
 
 // newCmdListAccount implements the list account command to list account crs

cmd/account/reset.go

@@ -16,8 +16,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
 )
 
 // newCmdReset implements the reset command which resets the specified account cr

cmd/account/rotate-secret.go

@@ -17,9 +17,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 // newCmdRotateSecret implements the rotate-secret command which rotate IAM User credentials

cmd/account/servicequotas/describe.go

@@ -12,8 +12,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
-	k8spkg "github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	k8spkg "github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 // newCmdDescribe implements servicequotas describe

cmd/account/servicequotas/update.go

@@ -11,8 +11,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
-	k8spkg "github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	k8spkg "github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 // newCmdUpdate implements servicequotas describe

cmd/account/set.go

@@ -13,8 +13,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
 )
 
 // newCmdSet implements the set command which sets fields in account cr status

cmd/account/verify-secrets.go

@@ -14,9 +14,9 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 const (

cmd/clusterdeployment/list.go

@@ -11,8 +11,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	"github.com/openshift/osd-utils-cli/pkg/printer"
+	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/printer"
 )
 
 // newCmdList implements the list command to list cluster deployment crs

cmd/cost/cost.go

@@ -3,8 +3,8 @@ package cost
 import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/organizations"
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	"github.com/openshift/osdctl/cmd/common"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"log"

cmd/cost/create.go

@@ -2,7 +2,7 @@ package cost
 
 import (
 	"fmt"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 

cmd/cost/create_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/organizations"
 	"github.com/golang/mock/gomock"
 	"github.com/onsi/gomega"
-	"github.com/openshift/osd-utils-cli/pkg/provider/aws/mock"
+	"github.com/openshift/osdctl/pkg/provider/aws/mock"
 	"testing"
 )
 

cmd/cost/get.go

@@ -2,7 +2,7 @@ package cost
 
 import (
 	"fmt"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 	"github.com/spf13/cobra"
 	"log"
 	"strconv"

cmd/cost/list.go

@@ -2,7 +2,7 @@ package cost
 
 import (
 	"fmt"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"log"

cmd/cost/reconcile.go

@@ -5,7 +5,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/costexplorer"
 	"github.com/aws/aws-sdk-go/service/organizations"
 	"github.com/deckarep/golang-set"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"

cmd/cost/reconcile_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/organizations"
 	"github.com/golang/mock/gomock"
 	"github.com/onsi/gomega"
-	"github.com/openshift/osd-utils-cli/pkg/provider/aws/mock"
+	"github.com/openshift/osdctl/pkg/provider/aws/mock"
 	"testing"
 )
 

cmd/federatedrole/apply.go

@@ -18,8 +18,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
-	awsprovider "github.com/openshift/osd-utils-cli/pkg/provider/aws"
+	"github.com/openshift/osdctl/pkg/k8s"
+	awsprovider "github.com/openshift/osdctl/pkg/provider/aws"
 )
 
 const (

cmd/metrics.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	routev1 "github.com/openshift/api/route/v1"
-	"github.com/openshift/osd-utils-cli/pkg/prom"
+	"github.com/openshift/osdctl/pkg/prom"
 	"github.com/spf13/cobra"
 
 	v1 "k8s.io/api/core/v1"
@@ -17,8 +17,8 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/cmd/common"
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
+	"github.com/openshift/osdctl/cmd/common"
+	"github.com/openshift/osdctl/pkg/k8s"
 )
 
 const (

cmd/network/packet-capture.go

@@ -25,7 +25,7 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/osd-utils-cli/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/k8s"
 )
 
 const (

cmd/post.go

@@ -7,8 +7,8 @@ import (
 	"github.com/openshift-online/ocm-cli/pkg/dump"
 	"github.com/openshift-online/ocm-cli/pkg/ocm"
 	sdk "github.com/openshift-online/ocm-sdk-go"
-	"github.com/openshift/osd-utils-cli/internal/servicelog"
-	"github.com/openshift/osd-utils-cli/internal/utils"
+	"github.com/openshift/osdctl/internal/servicelog"
+	"github.com/openshift/osdctl/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"io/ioutil"

cmd/root.go

@@ -13,11 +13,11 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 	"k8s.io/utils/pointer"
 
-	"github.com/openshift/osd-utils-cli/cmd/account"
-	"github.com/openshift/osd-utils-cli/cmd/clusterdeployment"
-	"github.com/openshift/osd-utils-cli/cmd/cost"
-	"github.com/openshift/osd-utils-cli/cmd/federatedrole"
-	"github.com/openshift/osd-utils-cli/cmd/network"
+	"github.com/openshift/osdctl/cmd/account"
+	"github.com/openshift/osdctl/cmd/clusterdeployment"
+	"github.com/openshift/osdctl/cmd/cost"
+	"github.com/openshift/osdctl/cmd/federatedrole"
+	"github.com/openshift/osdctl/cmd/network"
 )
 
 // GitCommit is the short git commit hash from the environment

go.mod

@@ -1,4 +1,4 @@
-module github.com/openshift/osd-utils-cli
+module github.com/openshift/osdctl
 
 go 1.14