Merge pull request #35 from oreillymedia/more-default-ospackages

danarbaugh · web-flow · commit 096c343655d5 · 2024-11-08T11:05:03.000-06:00
Filter additional "pkg-*" default packages
diff --git a/resources/opensearchservice-packages.go b/resources/opensearchservice-packages.go
@@ -57,7 +57,7 @@ func ListOSPackages(sess *session.Session) ([]Resource, error) {
 }
 
 func (o *OSPackage) Filter() error {
-	if strings.HasPrefix(*o.packageID, "G") {
+	if strings.HasPrefix(*o.packageID, "G") || strings.HasPrefix(*o.packageID, "pkg-") {
 		return fmt.Errorf("cannot delete default opensearch packages")
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func ListOSPackages(sess *session.Session) ([]Resource, error) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func (o *OSPackage) Filter() error {`
`60`		`- if strings.HasPrefix(*o.packageID, "G") {`
	`60`	`+ if strings.HasPrefix(o.packageID, "G") \|\| strings.HasPrefix(o.packageID, "pkg-") {`
`61`	`61`	`return fmt.Errorf("cannot delete default opensearch packages")`
`62`	`62`	`}`
`63`	`63`	`return nil`