improving get deployment method #2

fbrubbo · Mar 24, 2020 · c3dd8e7 · c3dd8e7
1 parent a5ab4ba
commit c3dd8e7
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/bin/kubectl-snapshot-darwin-386 b/bin/kubectl-snapshot-darwin-386
diff --git a/bin/kubectl-snapshot-darwin-amd64 b/bin/kubectl-snapshot-darwin-amd64
diff --git a/bin/kubectl-snapshot-linux-386 b/bin/kubectl-snapshot-linux-386
diff --git a/bin/kubectl-snapshot-linux-amd64 b/bin/kubectl-snapshot-linux-amd64
diff --git a/bin/kubectl-snapshot-windows-386.exe b/bin/kubectl-snapshot-windows-386.exe
diff --git a/bin/kubectl-snapshot-windows-amd64.exe b/bin/kubectl-snapshot-windows-amd64.exe
diff --git a/install.sh b/install.sh
@@ -16,13 +16,10 @@ done
 chmod +x ./sh/*
 cp ./sh/* ./bin/
 
-mkdir -p ~/repos/github/fbrubbo/kubectl-snapshot/bin
-cp bin/* ~/repos/github/fbrubbo/kubectl-snapshot/bin
-
 
 # TO TEST LOCALLY
 # 1. ./install.sh
-# 2. git push
+# 2. git add -A && git commit -m "Message: #issue" && git push
 # 4. create new release in github
 # 5. get the sha256 hash using https://emn178.github.io/online-tools/sha256_checksum.html
 # 6. replace all 'uri' and 'sha256' entries in resource-snapshot.yaml

diff --git a/main.go b/main.go
@@ -11,8 +11,8 @@ import (
 	"time"
 )
 
-const version = "0.1.2"
-const versionDesciption = "First krew plugin version"
+const version = "0.1.3"
+const versionDesciption = "Small change to improve get deployment name method"
 
 // TODO: sort-by ? How to handle the below scenarios?
 func main() {

diff --git a/resources.go b/resources.go
@@ -158,12 +158,13 @@ func (p Pod) findStatusCondition(test func(Condition) bool) Condition {
 
 //senninha-quotation-redis-slave-0
 // zoidberg-pentaho-report-1572104400-rklgx
-const stafulsetPattern = `^(.*)-(\d*)$`
-const deploymentPattern = `^(.*)-([^-]*)-([^-]*)$`
+const stafulsetPattern = `^(.*)-(\d+)$`
+const deploymentPattern = `^(.*)-([^-]*)-([^-]+)$`
 const jobPattern = `^(.*)-([^-]*)$`
 const unknownPattern = `^(.*)$`
 
 // GetDeploymentName should work for most of the cases
+// This best effort logic avoid lazy loading objects, but may fall into unknownPattern on corner cases
 func (p Pod) GetDeploymentName() string {
 	name := p.Metadata.Name
 	var reg *regexp.Regexp

diff --git a/resources_test.go b/resources_test.go
@@ -58,6 +58,8 @@ func TestGetDeploymentName(t *testing.T) {
 		testPodResource{res: Pod{Metadata: Metadata{Name: "shippingservice-545f46fb7f-f4c5b"}}, expected: "shippingservice"},
 		testPodResource{res: Pod{Metadata: Metadata{Name: "shipping-service-545f46fb7f-f4c5b"}}, expected: "shipping-service"},
 		testPodResource{res: Pod{Metadata: Metadata{Name: "forset"}}, expected: "forset"},
+		testPodResource{res: Pod{Metadata: Metadata{Name: "other-service"}}, expected: "other-service"},
+		testPodResource{res: Pod{Metadata: Metadata{Name: "other-service-"}}, expected: "other-service-"},
 	}
 
 	log.Infof("%+v", tests)