Initial refactor with compartments resource only

Author: Daniel Lloyd

README.md

@@ -1,5 +1,5 @@
 # OCI Shiv
-A tool for finding OCI instances and OKE Kubernetes clusters and then connecting to them via the OCI bastion service.
+A tool for quickly finding OCI resources and connecting to instances and OKE clusters.
 
 ## Quick examples
 
@@ -434,3 +434,8 @@ example
 ```
 sudo xattr -d com.apple.quarantine ~/.local/bin/oshiv
 ```
+
+## Reference
+
+https://docs.oracle.com/en-us/iaas/tools/go/65.78.0/
+

bastion/bastion.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -13,13 +12,8 @@ import (
 // bastionCmd represents the bastion command
 var bastionCmd = &cobra.Command{
 	Use:   "bastion",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Find, list, and connect via the OCI bastion service",
+	Long:  "TODO",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("bastion called")
 	},

cluster/cluster.go

@@ -1,33 +1,41 @@
-/*
-Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
-*/
 package cmd
 
 import (
-	"fmt"
-
+	"github.com/cnopslabs/oshiv/resources"
+	"github.com/cnopslabs/oshiv/utils"
+	"github.com/oracle/oci-go-sdk/identity"
 	"github.com/spf13/cobra"
 )
 
-// compartmentCmd represents the compartment command
 var compartmentCmd = &cobra.Command{
 	Use:   "compartment",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Find and list compartments",
+	Long:  "TODO",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("compartment called")
+		ociConfig := utils.SetupOciConfig()
+
+		identityClient, identityErr := identity.NewIdentityClientWithConfigurationProvider(ociConfig)
+		utils.CheckError(identityErr)
+
+		flagTenancyIdOverride, _ := cmd.Flags().GetString("tenancy-id-override")
+		tenancyId, tenancyName := resources.ValidateTenancyId(flagTenancyIdOverride, identityClient, ociConfig)
+
+		compartments := resources.FetchCompartments(tenancyId, identityClient)
+
+		flagList, _ := cmd.Flags().GetBool("list")
+		if flagList {
+			resources.ListCompartments(compartments, tenancyId, tenancyName)
+		}
+
+		flagFind, _ := cmd.Flags().GetString("find")
+		if flagFind != "" {
+			resources.FindCompartments(tenancyId, tenancyName, identityClient, flagFind)
+		}
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(compartmentCmd)
-
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command
@@ -36,5 +44,6 @@ func init() {
 
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:
-	// compartmentCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	compartmentCmd.Flags().BoolP("list", "l", false, "List all compartments")
+	compartmentCmd.Flags().StringP("find", "f", "", "Find compartment by name pattern search")
 }

cmd/bastion.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -13,13 +12,8 @@ import (
 // imageCmd represents the image command
 var imageCmd = &cobra.Command{
 	Use:   "image",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Find and list OCI compute images",
+	Long:  "TODO",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("image called")
 	},

cmd/compartment.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -13,13 +12,8 @@ import (
 // instanceCmd represents the instance command
 var instanceCmd = &cobra.Command{
 	Use:   "instance",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Find and list OCI instances",
+	Long:  "TODO",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("instance called")
 	},

cmd/image.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -13,13 +12,8 @@ import (
 // policyCmd represents the policy command
 var policyCmd = &cobra.Command{
 	Use:   "policy",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Find and list policies by name or statement",
+	Long:  "TODO",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("policy called")
 	},

cmd/instance.go

@@ -1,7 +1,3 @@
-/*
-Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
-*/
 package cmd
 
 import (
@@ -10,18 +6,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
-
-
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "oshiv",
-	Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "A tool for finding and connecting to OCI resources",
+	Long:  "A tool for finding OCI resources and for connecting to instances and OKE clusters via the OCI bastion service.",
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	// Run: func(cmd *cobra.Command, args []string) { },
@@ -43,9 +32,13 @@ func init() {
 
 	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.oshiv.yaml)")
 
+	// We need a way to override the default tenancy that we use to authenticate against
+	// One way to do that is to provide a flag for Tenancy ID
+	var FlagTenancyIdOverride string
+	rootCmd.PersistentFlags().StringVarP(&FlagTenancyIdOverride, "tenancy-id-override", "t", "", "Override's the default tenancy with this tenancy ID")
+	// rootCmd.MarkFlagRequired("tenancy-id")
+
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
-
-

cmd/policy.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -13,13 +12,8 @@ import (
 // sessionCmd represents the session command
 var sessionCmd = &cobra.Command{
 	Use:   "session",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Create, list, and connect to bastion sessions",
+	Long:  "TODO",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("session called")
 	},