Merge pull request #48 from dineshgowda24/prerelease

- Finish all release preps

Author: dineshgowda24

gcloud/cmd.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os/exec"
 	"strings"
 
 	"github.com/dineshgowda24/alfred-gcp-workflow/workflow/config"
+	"github.com/dineshgowda24/alfred-gcp-workflow/workflow/log"
 )
 
 func runGCloudCmd[T any](cfg *Config, cmd string, extraArgs ...string) (T, error) {
@@ -19,7 +19,7 @@ func runGCloudCmd[T any](cfg *Config, cmd string, extraArgs ...string) (T, error
 	cmdExec := exec.Command(config.GetGCloudPath(), args...)
 	cmdExec.Stderr = &stderr
 
-	log.Println("gcloud command:", cmdExec.String())
+	log.Info("gcloud command:", cmdExec.String())
 	raw, err := cmdExec.Output()
 	if err != nil {
 		return out, fmt.Errorf("gcloud command failed: %s", stderr.String())

info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>bundleid</key>
-	<string>dineshgowda.gcp</string>
+	<string>com.dineshchikkanna.alfred.gcp</string>
 	<key>category</key>
 	<string>Productivity</string>
 	<key>connections</key>
@@ -132,7 +132,7 @@
 				<key>argumenttype</key>
 				<integer>1</integer>
 				<key>escaping</key>
-				<integer>7</integer>
+				<integer>32</integer>
 				<key>keyword</key>
 				<string>gcp</string>
 				<key>queuedelaycustom</key>
@@ -146,7 +146,7 @@
 				<key>runningsubtext</key>
 				<string>Please Wait</string>
 				<key>script</key>
-				<string>./alfred-gcp-workflow --query={query}</string>
+				<string>./alfred-gcp-workflow --query="{query}"</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -213,7 +213,7 @@
 
 An Alfred workflow to quickly open GCP services in your browser or search GCP resources with ease.
 
-More more info visit: https://github.com/dineshgowda24/alfred-gcp-workflow</string>
+More info visit: https://github.com/dineshgowda24/alfred-gcp-workflow</string>
 	<key>uidata</key>
 	<dict>
 		<key>1B2C4A00-09E5-472C-84C9-ABC4017DBA62</key>
@@ -257,13 +257,13 @@ More more info visit: https://github.com/dineshgowda24/alfred-gcp-workflow</stri
 	<key>variables</key>
 	<dict>
 		<key>ALFRED_GCP_WORKFLOW_CACHE_TTL_SECONDS</key>
-		<string>172800</string>
+		<string>604800</string>
 	</dict>
 	<key>variablesdontexport</key>
 	<array/>
 	<key>version</key>
-	<string>v0.1.0-beta</string>
+	<string>v0.0.1</string>
 	<key>webaddress</key>
-	<string>https://dineshgowda.com</string>
+	<string>https://github.com/dineshgowda24/alfred-gcp-workflow</string>
 </dict>
 </plist>

orchestrator/home.go

@@ -70,6 +70,8 @@ func (h *HomeHandler) Handle(ctx *Context) error {
 			Subtitle:     "🔩 Use @ to override gcloud config",
 			Icon:         aw.IconAccount,
 			Valid:        false,
+			AutoComplete: "@",
+			Arg:          "@",
 			SortPriority: 4,
 		})
 
@@ -79,6 +81,8 @@ func (h *HomeHandler) Handle(ctx *Context) error {
 				Subtitle:     "🗺️ Use `$` to override region",
 				Icon:         aw.IconNetwork,
 				Valid:        false,
+				AutoComplete: "$",
+				Arg:          "$",
 				SortPriority: 5,
 			})
 		} else {
@@ -87,6 +91,8 @@ func (h *HomeHandler) Handle(ctx *Context) error {
 				Subtitle:     "🗺️ Use `$` to override region",
 				Icon:         aw.IconNetwork,
 				Valid:        false,
+				AutoComplete: "$",
+				Arg:          "$",
 				SortPriority: 6,
 			})
 		}

orchestrator/util.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	contributingURL = "https://github.com/dineshgowda24/alfred-gcp-workflow/CONTRIBUTING.md"
+	contributingURL = "https://github.com/dineshgowda24/alfred-gcp-workflow/blob/main/CONTRIBUTING.md"
 )
 
 func buildAutocomplete(ctx *Context, service *services.Service) string {

parser/query.go

@@ -1,12 +1,12 @@
 package parser
 
 import (
-	"log"
 	"strings"
 
 	"github.com/dineshgowda24/alfred-gcp-workflow/gcloud"
 	"github.com/dineshgowda24/alfred-gcp-workflow/services"
 	"github.com/dineshgowda24/alfred-gcp-workflow/workflow/arg"
+	"github.com/dineshgowda24/alfred-gcp-workflow/workflow/log"
 )
 
 type Result struct {
@@ -99,7 +99,7 @@ func (r *Result) extractConfig(words []string) []string {
 func (r *Result) matchConfig(name string) {
 	configs, err := gcloud.GetAllConfigs()
 	if err != nil {
-		log.Println("error fetching configs:", err)
+		log.Error("error fetching configs:", err)
 		r.PartialConfigQuery = name
 		return
 	}

searchers/searcher.go

@@ -20,10 +20,12 @@ import (
 	"github.com/dineshgowda24/alfred-gcp-workflow/services"
 )
 
+// Searcher is an interface for searching GCP resources.
 type Searcher interface {
 	Search(wf *aw.Workflow, svc *services.Service, config *gcloud.Config, pq *parser.Result) error
 }
 
+// Registry contains the map of all the searchers.
 type Registry struct {
 	lookup map[string]Searcher
 }
@@ -46,32 +48,33 @@ func (r *Registry) Exists(parent, child *services.Service) bool {
 	return ok
 }
 
+// GetDefaultRegistry returns a default registry with all the searchers registered.
 func GetDefaultRegistry() *Registry {
 	return &Registry{
 		lookup: map[string]Searcher{
+			"artifactregistry/repositories": &artifactregistry.RepositorySearcher{},
+			"cloudrun/functions":            &cloudrun.FunctionSearcher{},
+			"cloudrun/services":             &cloudrun.ServiceSearcher{},
 			"cloudsql/instances":            &sql.InstanceSearcher{},
-			"memorystore/redis":             &memorystore.RedisInstanceSearcher{},
-			"pubsub/topics":                 &pubsub.TopicSearcher{},
-			"pubsub/subscriptions":          &pubsub.SubscriptionSearcher{},
-			"storage/buckets":               &storage.BucketSearcher{},
-			"compute/instances":             &compute.InstanceSearcher{},
+			"cloudtasks/queues":             &cloudtask.QueueSearcher{},
 			"compute/disks":                 &compute.DiskSearcher{},
 			"compute/images":                &compute.ImageSearcher{},
+			"compute/instances":             &compute.InstanceSearcher{},
 			"compute/instancetemplates":     &compute.InstanceTmplSearcher{},
 			"compute/machineimages":         &compute.MachineImageSearcher{},
 			"compute/snapshots":             &compute.SnapshotSearcher{},
-			"gke/clusters":                  &k8s.ClusterSearcher{},
 			"filestore/instances":           &filestore.InstanceSearcher{},
+			"gke/clusters":                  &k8s.ClusterSearcher{},
+			"memorystore/redis":             &memorystore.RedisInstanceSearcher{},
+			"netconnectivity/cloudrouter":   &netconnectivity.CloudRouterSearcher{},
+			"netconnectivity/vpngateway":    &netconnectivity.VPNGatewaySearcher{},
+			"netconnectivity/vpntunnel":     &netconnectivity.VPNTunnelSearcher{},
 			"netservices/dns":               &netservices.DNSZoneSearcher{},
+			"pubsub/subscriptions":          &pubsub.SubscriptionSearcher{},
+			"pubsub/topics":                 &pubsub.TopicSearcher{},
+			"storage/buckets":               &storage.BucketSearcher{},
 			"vpc/networks":                  &vpc.NetworkSearcher{},
 			"vpc/routes":                    &vpc.RouteSearcher{},
-			"netconnectivity/vpntunnel":     &netconnectivity.VPNTunnelSearcher{},
-			"netconnectivity/vpngateway":    &netconnectivity.VPNGatewaySearcher{},
-			"netconnectivity/cloudrouter":   &netconnectivity.CloudRouterSearcher{},
-			"artifactregistry/repositories": &artifactregistry.RepositorySearcher{},
-			"cloudrun/services":             &cloudrun.ServiceSearcher{},
-			"cloudrun/functions":            &cloudrun.FunctionSearcher{},
-			"cloudtasks/queues":             &cloudtask.QueueSearcher{},
 		},
 	}
 }

services/service.go

@@ -3,12 +3,12 @@ package services
 import (
 	"bytes"
 	"embed"
-	"log"
 	"path/filepath"
 	"text/template"
 
 	aw "github.com/deanishe/awgo"
 	"github.com/dineshgowda24/alfred-gcp-workflow/gcloud"
+	"github.com/dineshgowda24/alfred-gcp-workflow/workflow/log"
 	"gopkg.in/yaml.v2"
 )
 
@@ -54,13 +54,13 @@ func (s *Service) Icon() *aw.Icon {
 func (s *Service) Url(config *gcloud.Config) (string, error) {
 	t, err := template.New("url").Parse(s.URL)
 	if err != nil {
-		log.Printf("error parsing template for service %s: %v\n", s.Name, err)
+		log.Errorf("error parsing template for service %s: %v", s.Name, err)
 		return "", err
 	}
 
 	var buf bytes.Buffer
 	if err := t.Execute(&buf, config); err != nil {
-		log.Printf("error executing template for service %s: %v\n", s.Name, err)
+		log.Errorf("error executing template for service %s: %v", s.Name, err)
 		return "", err
 	}
 	return buf.String(), nil

tools/release.sh

@@ -2,7 +2,9 @@
 set -euo pipefail
 
 RELEASE_DIR="$(pwd)/release/"
-PACKAGE_NAME="alfred-gcp-workflow.alfredworkflow"
+PKG_DIR="$(pwd)"
+PACKAGE_NAME="$PKG_DIR/alfred-gcp-workflow.alfredworkflow"
+BUNDLE_ID="com.dineshchikkanna.alfred.gcp"
 
 bold() { echo -e "\033[1m$1\033[0m"; }
 green() { echo -e "\033[32m$1\033[0m"; }
@@ -97,6 +99,30 @@ copy_assets() {
   cp -R assets services.yml regions.yml icon.png info.plist LICENSE README.md "$RELEASE_DIR"
 }
 
+code_sign() {
+  bold "Code signing the workflow..."
+  cd "$RELEASE_DIR" || exit 1
+
+  if [[ $SHOULD_TAG != "y" && $SHOULD_TAG != "Y" ]]; then
+    yellow "⚡ Skipping code signing as no tag was created."
+    return
+  fi
+
+  if [[ -z "${APPLE_DEVELOPER_ID_CERT_ID:-}" ]]; then
+    red "❌ Missing Apple Developer ID Certificate ID. Please set the APPLE_DEVELOPER_ID_CERT_ID environment variable."
+    exit 1
+  fi
+  
+  codesign -s "$APPLE_DEVELOPER_ID_CERT_ID" -f -v --timestamp --options runtime ./alfred-gcp-workflow
+  if [[ $? -ne 0 ]]; then
+    red "❌ Code signing failed. Please ensure you have a valid code signing identity."
+    exit 1
+  fi
+  
+  green "✔️ Code signed successfully."
+  cd "$PKG_DIR" || exit 1
+}
+
 package_workflow() {
   bold "Packaging .alfredworkflow file..."
   ditto -ck "$RELEASE_DIR" "$PACKAGE_NAME"
@@ -109,6 +135,33 @@ zip_workflow() {
   green "✔️ Zipped workflow."
 }
 
+notarize_app() {
+  bold "Notarizing the build..."
+
+  if [[ $SHOULD_TAG != "y" && $SHOULD_TAG != "Y" ]]; then
+    yellow "⚡ Skipping notarization as no tag was created."
+    return
+  fi
+
+  if [[ -z "${APPLE_ID:-}" || -z "${APPLE_TEAM_ID:-}" || -z "${APPLE_DEVELOPER_APP_PASSWORD:-}" ]]; then
+    red "❌ Missing Apple ID, Team ID, or Developer App Password. Please set these environment variables."
+    exit 1
+  fi
+ 
+  xcrun notarytool submit "${PACKAGE_NAME}.zip" \
+    --wait \
+    --apple-id "$APPLE_ID" \
+    --team-id "$APPLE_TEAM_ID" \
+    --password "$APPLE_DEVELOPER_APP_PASSWORD" 
+  
+  if [[ $? -ne 0 ]]; then
+    red "❌ Notarization failed. Please check your credentials and try again."
+    exit 1
+  fi
+  
+  green "✔️ Notarization completed successfully."
+}
+
 open_github_release_page() {
   bold "Opening GitHub release page for tag ${VERSION}..."
   open "https://github.com/dineshgowda24/alfred-gcp-workflow/releases/new?tag=${VERSION}&title=${VERSION}&body=%23%23%20Changes%0A%0AUser-facing%0A-%20TODO"
@@ -134,8 +187,10 @@ main() {
   merge_binaries
   clean_intermediate_binaries
   copy_assets
+  code_sign
   package_workflow
   zip_workflow
+  notarize_app
   show_files
   open_github_release_page
   open_finder

workflow/resource/resource.go

@@ -105,7 +105,10 @@ func (b *Builder[T]) store() error {
 
 	data, err := b.fetch(b.cfg)
 	if err != nil {
-		b.wf.Cache.Store(b.errKey(), []byte(err.Error()))
+		msg := UXMsg{
+			Error: err.Error(),
+		}
+		b.wf.Cache.StoreJSON(b.errKey(), &msg)
 		return err
 	}
 	return b.wf.Cache.StoreJSON(b.cacheKey(), data)
@@ -169,17 +172,31 @@ func (b *Builder[T]) showCachedErr() bool {
 
 		title := msg.Title
 		icon := aw.IconInfo
+		subtitle := msg.Subtitle
 		if msg.Error != "" {
-			title = msg.Error
+			title = "🔔 Error fetching resources"
+			subtitle = "<CMD> + l to view error details"
 			icon = aw.IconError
 		}
 
 		b.wf.NewItem(title).
-			Subtitle(msg.Subtitle).
+			Subtitle(subtitle).
 			Icon(icon).
 			Arg("").
 			Valid(false).
+			Largetype(msg.Error).
 			Autocomplete("")
+
+		if msg.Error != "" {
+			errorFilePath := filepath.Join(b.wf.CacheDir(), b.errKey())
+			b.wf.NewFileItem("📂 View full error file").
+				Subtitle("<CTRL> to open file options").
+				Icon(aw.IconInfo).
+				IsFile(true).
+				Arg(errorFilePath).
+				Valid(true)
+
+		}
 		b.wf.SendFeedback()
 		return true
 	}