Rename DatabaseSnapshot to Snapshot

docs/kubedb/describe.md

@@ -13,7 +13,7 @@ description of a given resource or group of resources.Valid resource types inclu
   * all
   * elastic
   * postgres
-  * databasesnapshot
+  * snapshot
   * deleteddatabase
 
 Examples:

docs/kubedb/get.md

@@ -14,7 +14,7 @@ Valid resource types include:
   * all
   * elastic
   * postgres
-  * databasesnapshot
+  * snapshot
   * deleteddatabase
 
 Examples:
@@ -27,8 +27,8 @@ Examples:
   # List a single postgres with specified NAME in ps output format.
   kubedb get postgres database
 
-  # List a single databasesnapshot in JSON output format.
-  kubedb get -o json databasesnapshot snapshot-xyz
+  # List a single snapshot in JSON output format.
+  kubedb get -o json snapshot snapshot-xyz
 
   # List all postgreses and elastics together in ps output format.
   kubedb get postgreses,elastics

pkg/cmd/decoder/decode.go

@@ -23,12 +23,12 @@ func Decode(kind string, data []byte) (runtime.Object, error) {
 		}
 		return postgres, nil
 
-	case tapi.ResourceKindDatabaseSnapshot:
-		var dbSnapshot *tapi.DatabaseSnapshot
-		if err := yaml.Unmarshal(data, &dbSnapshot); err != nil {
+	case tapi.ResourceKindSnapshot:
+		var snapshot *tapi.Snapshot
+		if err := yaml.Unmarshal(data, &snapshot); err != nil {
 			return nil, err
 		}
-		return dbSnapshot, nil
+		return snapshot, nil
 	case tapi.ResourceKindDeletedDatabase:
 		var deletedDb *tapi.DeletedDatabase
 		if err := yaml.Unmarshal(data, &deletedDb); err != nil {

pkg/cmd/describer/describer.go

@@ -45,7 +45,7 @@ func newHumanReadableDescriber(f cmdutil.Factory) *humanReadableDescriber {
 func (h *humanReadableDescriber) addDefaultHandlers() {
 	h.Handler(h.describeElastic)
 	h.Handler(h.describePostgres)
-	h.Handler(h.describeDatabaseSnapshot)
+	h.Handler(h.describeSnapshot)
 	h.Handler(h.describeDeletedDatabase)
 }
 

pkg/cmd/describer/k8sdb_describer.go

@@ -23,7 +23,7 @@ func (d *humanReadableDescriber) describeElastic(item *tapi.Elastic, describerSe
 		return "", err
 	}
 
-	snapshots, err := d.extensionsClient.DatabaseSnapshots(item.Namespace).List(
+	snapshots, err := d.extensionsClient.Snapshots(item.Namespace).List(
 		kapi.ListOptions{
 			LabelSelector: labels.SelectorFromSet(
 				map[string]string{
@@ -89,7 +89,7 @@ func (d *humanReadableDescriber) describePostgres(item *tapi.Postgres, describer
 		return "", err
 	}
 
-	snapshots, err := d.extensionsClient.DatabaseSnapshots(item.Namespace).List(
+	snapshots, err := d.extensionsClient.Snapshots(item.Namespace).List(
 		kapi.ListOptions{
 			LabelSelector: labels.SelectorFromSet(
 				map[string]string{
@@ -151,7 +151,7 @@ func (d *humanReadableDescriber) describePostgres(item *tapi.Postgres, describer
 	})
 }
 
-func (d *humanReadableDescriber) describeDatabaseSnapshot(item *tapi.DatabaseSnapshot, describerSettings *kubectl.DescriberSettings) (string, error) {
+func (d *humanReadableDescriber) describeSnapshot(item *tapi.Snapshot, describerSettings *kubectl.DescriberSettings) (string, error) {
 	clientSet, err := d.ClientSet()
 	if err != nil {
 		return "", err
@@ -263,7 +263,7 @@ func describeStorage(storage *tapi.StorageSpec, out io.Writer) {
 	fmt.Fprintf(out, "  Access Modes:\t%s\n", accessModes)
 }
 
-func listSnapshots(snapshotList *tapi.DatabaseSnapshotList, out io.Writer) {
+func listSnapshots(snapshotList *tapi.SnapshotList, out io.Writer) {
 	fmt.Fprint(out, "\n")
 
 	if len(snapshotList.Items) == 0 {

pkg/cmd/get.go

@@ -36,8 +36,8 @@ var (
 		# List a single postgres with specified NAME in ps output format.
 		kubedb get postgres database
 
-		# List a single databasesnapshot in JSON output format.
-		kubedb get -o json databasesnapshot snapshot-xyz
+		# List a single snapshot in JSON output format.
+		kubedb get -o json snapshot snapshot-xyz
 
 		# List all postgreses and elastics together in ps output format.
 		kubedb get postgreses,elastics
@@ -68,7 +68,7 @@ const (
     * all
     * elastic
     * postgres
-    * databasesnapshot
+    * snapshot
     * deleteddatabase
     `
 )

pkg/cmd/printer/resource_printer.go

@@ -81,8 +81,8 @@ func (h *HumanReadablePrinter) addDefaultHandlers() {
 	h.Handler(h.printElastic)
 	h.Handler(h.printPostgresList)
 	h.Handler(h.printPostgres)
-	h.Handler(h.printDatabaseSnapshotList)
-	h.Handler(h.printDatabaseSnapshot)
+	h.Handler(h.printSnapshotList)
+	h.Handler(h.printSnapshot)
 	h.Handler(h.printDeletedDatabaseList)
 	h.Handler(h.printDeletedDatabase)
 }
@@ -226,7 +226,7 @@ func (h *HumanReadablePrinter) printPostgresList(itemList *tapi.PostgresList, w
 	return nil
 }
 
-func (h *HumanReadablePrinter) printDatabaseSnapshot(item *tapi.DatabaseSnapshot, w io.Writer, options PrintOptions) error {
+func (h *HumanReadablePrinter) printSnapshot(item *tapi.Snapshot, w io.Writer, options PrintOptions) error {
 	name := formatResourceName(options.Kind, item.Name, options.WithKind)
 
 	namespace := item.Namespace
@@ -260,9 +260,9 @@ func (h *HumanReadablePrinter) printDatabaseSnapshot(item *tapi.DatabaseSnapshot
 	return err
 }
 
-func (h *HumanReadablePrinter) printDatabaseSnapshotList(itemList *tapi.DatabaseSnapshotList, w io.Writer, options PrintOptions) error {
+func (h *HumanReadablePrinter) printSnapshotList(itemList *tapi.SnapshotList, w io.Writer, options PrintOptions) error {
 	for _, item := range itemList.Items {
-		if err := h.printDatabaseSnapshot(&item, w, options); err != nil {
+		if err := h.printSnapshot(&item, w, options); err != nil {
 			return err
 		}
 	}
@@ -423,7 +423,7 @@ func formatWideHeaders(wide bool, t reflect.Type) []string {
 		if t.String() == "*api.Postgres" || t.String() == "*api.PostgresList" {
 			return []string{"VERSION"}
 		}
-		if t.String() == "*api.DatabaseSnapshot" || t.String() == "*api.DatabaseSnapshotList" {
+		if t.String() == "*api.Snapshot" || t.String() == "*api.SnapshotList" {
 			return []string{"BUCKET"}
 		}
 	}

pkg/cmd/util/resource.go

@@ -19,10 +19,10 @@ func GetSupportedResourceKind(resource string) (string, error) {
 	case strings.ToLower(tapi.ResourceTypePostgres):
 	case strings.ToLower(tapi.ResourceCodePostgres):
 		return tapi.ResourceKindPostgres, nil
-	case strings.ToLower(tapi.ResourceKindDatabaseSnapshot):
-	case strings.ToLower(tapi.ResourceTypeDatabaseSnapshot):
-	case strings.ToLower(tapi.ResourceCodeDatabaseSnapshot):
-		return tapi.ResourceKindDatabaseSnapshot, nil
+	case strings.ToLower(tapi.ResourceKindSnapshot):
+	case strings.ToLower(tapi.ResourceTypeSnapshot):
+	case strings.ToLower(tapi.ResourceCodeSnapshot):
+		return tapi.ResourceKindSnapshot, nil
 	case strings.ToLower(tapi.ResourceKindDeletedDatabase):
 	case strings.ToLower(tapi.ResourceTypeDeletedDatabase):
 	case strings.ToLower(tapi.ResourceCodeDeletedDatabase):
@@ -37,7 +37,7 @@ func CheckSupportedResource(kind string) error {
 	switch kind {
 	case tapi.ResourceKindElastic:
 	case tapi.ResourceKindPostgres:
-	case tapi.ResourceKindDatabaseSnapshot:
+	case tapi.ResourceKindSnapshot:
 	case tapi.ResourceKindDeletedDatabase:
 		return nil
 	default:
@@ -51,7 +51,7 @@ func GetAllSupportedResources(f cmdutil.Factory) ([]string, error) {
 	resources := map[string]string{
 		tapi.ResourceNameElastic:          tapi.ResourceTypeElastic,
 		tapi.ResourceNamePostgres:         tapi.ResourceTypePostgres,
-		tapi.ResourceNameDatabaseSnapshot: tapi.ResourceTypeDatabaseSnapshot,
+		tapi.ResourceNameSnapshot: tapi.ResourceTypeSnapshot,
 		tapi.ResourceNameDeletedDatabase:  tapi.ResourceTypeDeletedDatabase,
 	}
 
@@ -78,7 +78,7 @@ func GetAllSupportedResources(f cmdutil.Factory) ([]string, error) {
 var ShortForms = map[string]string{
 	tapi.ResourceCodeElastic:          tapi.ResourceTypeElastic,
 	tapi.ResourceCodePostgres:         tapi.ResourceTypePostgres,
-	tapi.ResourceCodeDatabaseSnapshot: tapi.ResourceTypeDatabaseSnapshot,
+	tapi.ResourceCodeSnapshot: tapi.ResourceTypeSnapshot,
 	tapi.ResourceCodeDeletedDatabase:  tapi.ResourceTypeDeletedDatabase,
 }