make GCS support enabled by default

Author: hoxhaeris

AUTHORIZATION.md

@@ -73,7 +73,7 @@ type AuthConfigSource interface {
 
 - **`github.com/openshift-eng/cyborg-data`**: External reusable core package for organizational data access
   - Supports multiple data sources (files, GCS)
-  - Build with `-tags gcs` for cloud storage support
+  - GCS support included by default
   - Hot reload with configurable check intervals
 - **`pkg/orgdata/`**: Slack-specific wrapper around core package  
 - **`pkg/slack/`**: Slack command handlers with authorization middleware
@@ -94,8 +94,8 @@ type AuthConfigSource interface {
 #### Option B: Google Cloud Storage (Production)
 
 ```bash
-# Build with GCS support
-make BUILD_FLAGS="-tags gcs" build
+# Build (GCS support included by default)
+make build
 
 # Run with GCS backend
 ./ci-chat-bot \
@@ -329,7 +329,7 @@ service := orgdata.NewIndexedOrgDataService()
 // Option 1: Load from local files  
 err := service.LoadFromFiles([]string{"comprehensive_index.json"})
 
-// Option 2: Load from GCS (requires -tags gcs)
+// Option 2: Load from GCS
 gcsConfig := orgdata.GCSConfig{
     Bucket:        "resolved-org",
     ObjectPath:    "orgdata/comprehensive_index.json", 
@@ -371,9 +371,9 @@ The `AuthorizedCommandHandler` wrapper:
 ### Common Issues
 
 **"Authorization service not configured"**
-- **Local files**: Check `--orgdata-paths` and `--authorization-config` flags  
+- **Local files**: Check `--orgdata-paths` and `--authorization-config` flags
 - **GCS**: Verify `--gcs-enabled=true` and GCS configuration flags
-- **Build**: Ensure binary built with `-tags gcs` for GCS support
+- **Build**: GCS support is included in all builds by default
 - **Authentication**: Run `gcloud auth login` or set service account credentials
 - **Logs**: Check for data loading errors, GCS authentication failures
 
@@ -408,7 +408,7 @@ The system can load organizational data from multiple sources:
 ```
 - **Best for**: Production, cross-cluster deployments
 - **Hot Reload**: Configurable polling (default: 5 minutes)
-- **Dependencies**: Requires `-tags gcs` build flag
+- **Dependencies**: GCS support included by default
 - **Authentication**: Application Default Credentials or service account JSON
 
 ### Development Scripts

Makefile

@@ -9,18 +9,13 @@ build_date=$(shell date -u '+%Y%m%d')
 version=v${build_date}-${git_commit}
 
 SOURCE_GIT_TAG=v1.0.0+$(shell git rev-parse --short=7 HEAD)
-# Use standard GO_BUILD_FLAGS for build tags (e.g., -tags gcs)
-GO_BUILD_FLAGS ?=
+# GCS support is enabled by default - append to build machinery's defaults
+GO_BUILD_FLAGS += -tags gcs
 
 # Extend OpenShift's standard ldflags
 GO_LD_EXTRAFLAGS=-X github.com/openshift/ci-chat-bot/vendor/k8s.io/client-go/pkg/version.gitCommit=$(shell git rev-parse HEAD) -X github.com/openshift/ci-chat-bot/vendor/k8s.io/client-go/pkg/version.gitVersion=${SOURCE_GIT_TAG} -X sigs.k8s.io/prow/version.Name=ci-chat-bot -X sigs.k8s.io/prow/version.Version=${version}
 GOLINT=golangci-lint run
 
-# Build with GCS support enabled
-build-gcs:
-	$(MAKE) GO_BUILD_FLAGS="-tags gcs" build
-.PHONY: build-gcs
-
 debug:
 	go build $(GO_BUILD_FLAGS) -gcflags="all=-N -l" $(GO_LD_FLAGS) $(GO_MOD_FLAGS) -o ci-chat-bot ./cmd/...
 .PHONY: debug
@@ -49,15 +44,14 @@ run-local:
 
 help-ci-chat-bot:
 	@echo "CI Chat Bot specific targets:"
-	@echo "  build            - Build ci-chat-bot binary (standard OpenShift build)"
-	@echo "  build-gcs        - Build with GCS support enabled (-tags gcs)"
+	@echo "  build            - Build ci-chat-bot binary (GCS support included by default)"
 	@echo "  debug            - Build with debug symbols"
 	@echo "  run              - Run ci-chat-bot with hack/run.sh (auto-detects GCS vs local)"
 	@echo "  run-gcs          - Run with GCS backend explicitly"
 	@echo "  run-local        - Run with local file backend explicitly"
 	@echo ""
 	@echo "Build flags:"
-	@echo "  GO_BUILD_FLAGS   - Standard OpenShift build flags (e.g., GO_BUILD_FLAGS='-tags gcs' make build)"
+	@echo "  GO_BUILD_FLAGS   - Standard OpenShift build flags for custom tags"
 	@echo ""
 	@echo "Environment variables for hack scripts:"
 	@echo "  USE_GCS_ORGDATA  - Set to 'true' to use GCS backend"
@@ -67,8 +61,7 @@ help-ci-chat-bot:
 	@echo "  AUTH_CONFIG      - Authorization config file path"
 	@echo ""
 	@echo "Examples:"
-	@echo "  make build-gcs                            # Build with GCS support (recommended)"
-	@echo "  make GO_BUILD_FLAGS='-tags gcs' build     # Build with GCS using OpenShift standard"
+	@echo "  make build                                # Build with all features (GCS included)"
 	@echo "  make run-gcs                              # Run with GCS backend"
 	@echo "  ORGDATA_PATHS=/my/file.json make run      # Run with custom local file"
 .PHONY: help-ci-chat-bot

README.md

@@ -20,10 +20,10 @@ To see the available commands, type `help`.
 - **Hot reload**: Both file watching and GCS polling for live updates
 - **Pluggable architecture**: Easy to extend with new data sources
 
-### 🚀 **Production Ready**  
+### 🚀 **Production Ready**
 - **Fast performance**: O(1) organizational lookups with pre-computed indexes
 - **Thread-safe**: Concurrent access with read-write mutex protection
-- **Build flexibility**: Optional GCS support with build tags (`-tags gcs`)
+- **GCS support**: Cloud storage support included by default
 - **Secure authentication**: Application Default Credentials for GCS
 
 ## Quick Start
@@ -39,8 +39,8 @@ export ORGDATA_PATHS="/path/to/comprehensive_index.json"
 
 ### Option 2: Google Cloud Storage
 ```bash
-# Build with GCS support
-make BUILD_FLAGS="-tags gcs" build
+# Build (GCS support included by default)
+make build
 
 # Quick start with GCS
 ./hack/run-with-gcs.sh
@@ -66,12 +66,9 @@ export GCS_OBJECT_PATH="orgdata/comprehensive_index.json"
 ## Build Options
 
 ```bash
-# Standard build (file-based data sources only)
+# Build (includes both file-based and GCS data sources)
 make build
 
-# Build with GCS support
-make BUILD_FLAGS="-tags gcs" build
-
 # See all available targets
 make help-ci-chat-bot
 ```

hack/run.sh

@@ -24,15 +24,13 @@ oc --context app.ci -n ci get secrets ci-chat-bot-slack-app --template='{{index
 
 work_dir=$(readlink -f $(dirname $0)/..)
 
-# Determine build flags based on configuration
-build_flags=""
+# Determine orgdata configuration
 orgdata_flags=""
 
 # Check if GCS is enabled
 if [[ "${USE_GCS_ORGDATA:-false}" == "true" ]]; then
-  echo "Building with GCS support..."
-  build_flags="-tags gcs"
-  
+  echo "Using GCS backend..."
+
   # GCS configuration with defaults
   GCS_BUCKET="${GCS_BUCKET:-resolved-org}"
   GCS_OBJECT_PATH="${GCS_OBJECT_PATH:-orgdata/comprehensive_index.json}"
@@ -71,7 +69,7 @@ fi
 AUTH_CONFIG="${AUTH_CONFIG:-${work_dir}/test-authorization.yaml}"
 
 echo "Building ci-chat-bot..."
-make GO_BUILD_FLAGS="$build_flags"
+make
 
 echo "Starting ci-chat-bot with $(echo $orgdata_flags | cut -d' ' -f1) backend..."
 ./ci-chat-bot \

pkg/orgdata/gcs_support.go

@@ -1,6 +1,3 @@
-//go:build gcs
-// +build gcs
-
 package orgdata
 
 import (