Move project-name flag to project-id

Signed-off-by: Elis Lulja <[email protected]>

Author: asimpleidea

cmd/firestore/firestore.go

@@ -68,7 +68,7 @@ func NewFirestoreCommand() *cobra.Command {
 
 	// -- Flags
 	cmd.Flags().StringVarP(&opts.serviceAccountPath, "service-account-path", "s", "", "the path to the service account")
-	cmd.Flags().StringVarP(&opts.projectName, "project-name", "n", "", "the name of the firebase project")
+	cmd.Flags().StringVarP(&opts.projectID, "project-id", "i", "", "the id of the firebase project")
 	cmd.Flags().StringVarP(&opts.chatsCollection, "chats-collection", "c", "", "the name of the collections where chats are stored")
 	cmd.Flags().BoolVar(&opts.listen, "listen", true, "whether to listening to chat updates or not")
 
@@ -94,7 +94,7 @@ func runFirestore(opts *firestoreOptions) {
 
 	// -- Get the backend
 	fs, err := firestore.NewBackend(ctx, opts.serviceAccountPath, &firestore.Options{
-		ProjectName:     opts.projectName,
+		ProjectID:       opts.projectID,
 		ChatsCollection: opts.chatsCollection,
 		UseCache:        true,
 	})

cmd/firestore/options.go

@@ -5,7 +5,7 @@ type firestoreOptions struct {
 	debug              bool
 	listen             bool
 	serviceAccountPath string
-	projectName        string
+	projectID          string
 	address            string
 	port               int
 }

deploy/deployment.yaml

@@ -37,7 +37,7 @@ spec:
         - firestore
         - --chats-collection
         - $(CHATS_COLLECTION)
-        - --project-name
+        - --project-id
         - $(FIREBASE_PROJECT_ID)
         - --service-account-path
         - /credentials/service-account.json

pkg/firestore/fs-opts.go

@@ -2,8 +2,8 @@ package firestore
 
 // Options contains options for firestore
 type Options struct {
-	// ProjectName is the name of the firebase project
-	ProjectName string `yaml:"projectName"`
+	// ProjectID is the id of the firebase project
+	ProjectID string `yaml:"projectId"`
 	// ChatsCollection is the name of the collections where
 	// chats are stored
 	ChatsCollection string `yaml:"chatsCollection"`

pkg/firestore/fs.go

@@ -48,12 +48,12 @@ func NewBackend(ctx context.Context, servAcc string, opts *Options) (backend.Bac
 	if len(opts.ChatsCollection) == 0 {
 		return nil, fmt.Errorf("no chat collection set")
 	}
-	if len(opts.ProjectName) == 0 {
+	if len(opts.ProjectID) == 0 {
 		return nil, fmt.Errorf("no project name set")
 	}
 
 	// -- Load firebase
-	conf := &firebase.Config{ProjectID: opts.ProjectName}
+	conf := &firebase.Config{ProjectID: opts.ProjectID}
 	app, err := firebase.NewApp(ctx, conf, option.WithServiceAccountFile(servAcc))
 	if err != nil {
 		return nil, err