Skip to content

Commit 143bae9

Browse files
committed
Modifying Env Variable name for modules
1 parent 7ae2521 commit 143bae9

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

module/module.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func getModuleorDefault() string {
5757

5858
// useAdminAPI checks if the Admin API implementation is enabled via environment variable.
5959
func useAdminAPI() bool {
60-
return strings.ToLower(os.Getenv("MODULES_USE_ADMIN_API")) == "true"
60+
return strings.ToLower(os.Getenv("APPENGINE_MODULES_USE_ADMIN_API")) == "true"
6161
}
6262

6363
// getService initializes the App Engine Admin API service.

module/module_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const module = "test-module"
2828
const instances = 3
2929

3030
func TestList_AdminAPI(t *testing.T) {
31-
os.Setenv("MODULES_USE_ADMIN_API", "true")
31+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
3232
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
33-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
33+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
3434

3535
// Mocking the Admin API response structure
3636
resp := &admin.ListServicesResponse{
@@ -69,9 +69,9 @@ func TestList_Legacy(t *testing.T) {
6969

7070
func TestNumInstances_AdminAPI(t *testing.T) {
7171
// Set the toggle to use the Admin API path
72-
os.Setenv("MODULES_USE_ADMIN_API", "true")
72+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
7373
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
74-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
74+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
7575
defer os.Unsetenv("GOOGLE_CLOUD_PROJECT")
7676

7777
tests := []struct {
@@ -147,9 +147,9 @@ func TestNumInstances_AdminAPI(t *testing.T) {
147147

148148
func TestSetNumInstances_AdminAPI(t *testing.T) {
149149
// 1. Setup environment for Admin API path
150-
os.Setenv("MODULES_USE_ADMIN_API", "true")
150+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
151151
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
152-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
152+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
153153
defer os.Unsetenv("GOOGLE_CLOUD_PROJECT")
154154

155155
tests := []struct {
@@ -245,10 +245,10 @@ func TestSetNumInstances_Legacy(t *testing.T) {
245245

246246
func TestVersions_AdminAPI(t *testing.T) {
247247
// 1. Setup environment for Admin API path
248-
os.Setenv("MODULES_USE_ADMIN_API", "true")
248+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
249249
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
250250
os.Setenv("GAE_SERVICE", "default") // For getModuleorDefault()
251-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
251+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
252252
defer os.Unsetenv("GOOGLE_CLOUD_PROJECT")
253253
defer os.Unsetenv("GAE_SERVICE")
254254

@@ -337,9 +337,9 @@ func TestVersions_Legacy(t *testing.T) {
337337

338338
func TestDefaultVersion_AdminAPI(t *testing.T) {
339339
// Setup environment for Admin API path
340-
os.Setenv("MODULES_USE_ADMIN_API", "true")
340+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
341341
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
342-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
342+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
343343
defer os.Unsetenv("GOOGLE_CLOUD_PROJECT")
344344

345345
tests := []struct {
@@ -467,9 +467,9 @@ func TestDefaultVersion_Legacy(t *testing.T) {
467467

468468
func TestStart_AdminAPI(t *testing.T) {
469469
// 1. Setup environment for Admin API path
470-
os.Setenv("MODULES_USE_ADMIN_API", "true")
470+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
471471
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
472-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
472+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
473473
defer os.Unsetenv("GOOGLE_CLOUD_PROJECT")
474474

475475
// 2. Mock Admin API Server
@@ -529,9 +529,9 @@ func TestStart_Legacy(t *testing.T) {
529529

530530
func TestStop_AdminAPI(t *testing.T) {
531531
// 1. Setup environment for Admin API path
532-
os.Setenv("MODULES_USE_ADMIN_API", "true")
532+
os.Setenv("APPENGINE_MODULES_USE_ADMIN_API", "true")
533533
os.Setenv("GOOGLE_CLOUD_PROJECT", "test-project")
534-
defer os.Unsetenv("MODULES_USE_ADMIN_API")
534+
defer os.Unsetenv("APPENGINE_MODULES_USE_ADMIN_API")
535535
defer os.Unsetenv("GOOGLE_CLOUD_PROJECT")
536536

537537
// 2. Mock Admin API Server

0 commit comments

Comments
 (0)