feat: substitute revision cpu and memory limits as env vars (#37)

Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> Co-authored-by: Calvine Otieno <calvine.otieno@healthcloud.co.ke>
savannahghi · Aug 6, 2021 · 3fcfe82 · 3fcfe82
1 parent 29744d9
commit 3fcfe82
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 52 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,6 +51,9 @@ env:
   JWT_KEY: ${{ secrets.JWT_KEY }}
   SAVANNAH_ADMIN_EMAIL: ${{ secrets.SAVANNAH_ADMIN_EMAIL }}
 
+concurrency:
+  group: lint-and-test
+
 jobs:
   lint_and_test:
     strategy:

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -18,10 +18,10 @@ steps:
       '--region', 'europe-west1',
       '--platform', 'managed',
       '--allow-unauthenticated',
-      '--min-instances', '1',
-      '--max-instances', '4',
-      '--memory', '1Gi',
-      '--cpu', '1',
+      '--min-instances', '${_MIN_INST}',
+      '--max-instances', '${_MAX_INST}',
+      '--memory', '${_MEMORY_LIMIT}',
+      '--cpu', '${_CPU}',
       '--set-secrets', '/tmp/secrets/.env=${_SECRET_NAME}:latest',
       '--timeout', '59m59s'
   ]
@@ -31,12 +31,12 @@ steps:
   - name: 'gcr.io/cloud-builders/gcloud'
     args: [
       'run',
+      'services',
       'update-traffic',
       "${_SERVICE_NAME}",
       '--to-latest',
       '--region', 'europe-west1',
       '--platform', 'managed',
-      '--allow-unauthenticated',
   ]
 
 images:

diff --git a/pkg/onboarding/presentation/rest/handlers_test.go b/pkg/onboarding/presentation/rest/handlers_test.go
@@ -649,6 +649,15 @@ func TestHandlersInterfacesImpl_CreateUserWithPhoneNumber(t *testing.T) {
 					return nil
 				}
 
+				fakeRepo.GetRolesByIDsFn = func(ctx context.Context, roleIDs []string) (*[]profileutils.Role, error) {
+					roles := []profileutils.Role{
+						{
+							ID: uuid.NewString(),
+						},
+					}
+					return &roles, nil
+				}
+
 				fakeRepo.GetUserCommunicationsSettingsFn = func(ctx context.Context, profileID string) (*profileutils.UserCommunicationsSetting, error) {
 					return &profileutils.UserCommunicationsSetting{
 						ID:            "111",

diff --git a/pkg/onboarding/repository/mock/onboarding.go b/pkg/onboarding/repository/mock/onboarding.go
@@ -142,8 +142,6 @@ type FakeOnboardingRepository struct {
 
 	GetUserCommunicationsSettingsFn func(ctx context.Context, profileID string) (*profileutils.UserCommunicationsSetting, error)
 
-	GetNavActionsFn func(ctx context.Context, role profileutils.RoleType) (*profileutils.NavigationActions, error)
-
 	SetUserCommunicationsSettingsFn func(ctx context.Context, profileID string,
 		allowWhatsApp *bool, allowTextSms *bool, allowPush *bool, allowEmail *bool) (*profileutils.UserCommunicationsSetting, error)
 

diff --git a/pkg/onboarding/usecases/agent_unit_test.go b/pkg/onboarding/usecases/agent_unit_test.go
@@ -859,6 +859,12 @@ func TestAgentUseCaseImpl_ActivateAgent(t *testing.T) {
 				fakeBaseExt.GetLoggedInUserFn = func(ctx context.Context) (*dto.UserInfo, error) {
 					return nil, fmt.Errorf("failed. could not get logged in user")
 				}
+				fakeRepo.GetUserProfileByIDFn = func(ctx context.Context, id string, suspended bool) (*profileutils.UserProfile, error) {
+					return &profileutils.UserProfile{}, nil
+				}
+				fakeRepo.UpdateSuspendedFn = func(ctx context.Context, id string, status bool) error {
+					return fmt.Errorf("failed to unsuspend/activate agent account")
+				}
 			}
 
 			if tt.name == "invalid:loggedin_user_does_not_have_employee_role" {
@@ -868,11 +874,8 @@ func TestAgentUseCaseImpl_ActivateAgent(t *testing.T) {
 					}, nil
 				}
 
-				fakeRepo.GetUserProfileByUIDFn = func(ctx context.Context, uid string, suspended bool) (*profileutils.UserProfile, error) {
-					return &profileutils.UserProfile{
-						ID:           "c9d62c7e-93e5-44a6-b503-6fc159c1782f",
-						VerifiedUIDS: []string{"f4f39af7-5b64-4c2f-91bd-42b3af315a4e"},
-					}, nil
+				fakeRepo.GetUserProfileByIDFn = func(ctx context.Context, id string, suspended bool) (*profileutils.UserProfile, error) {
+					return &profileutils.UserProfile{}, nil
 				}
 			}
 
@@ -1030,6 +1033,12 @@ func TestAgentUseCaseImpl_DeactivateAgent(t *testing.T) {
 				fakeBaseExt.GetLoggedInUserFn = func(ctx context.Context) (*dto.UserInfo, error) {
 					return nil, fmt.Errorf("failed. could not get logged in user")
 				}
+				fakeRepo.GetUserProfileByIDFn = func(ctx context.Context, id string, suspended bool) (*profileutils.UserProfile, error) {
+					return &profileutils.UserProfile{}, nil
+				}
+				fakeRepo.UpdateSuspendedFn = func(ctx context.Context, id string, status bool) error {
+					return fmt.Errorf("failed to unsuspend/activate agent account")
+				}
 			}
 
 			if tt.name == "invalid:loggedin_user_does_not_have_employee_role" {

diff --git a/pkg/onboarding/usecases/login_unit_test.go b/pkg/onboarding/usecases/login_unit_test.go
@@ -5,9 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/savannahghi/onboarding/pkg/onboarding/application/common"
 	"github.com/savannahghi/onboarding/pkg/onboarding/application/dto"
-	"github.com/segmentio/ksuid"
 
 	"github.com/google/uuid"
 	"github.com/savannahghi/feedlib"
@@ -369,40 +367,13 @@ func TestProfileUseCaseImpl_LoginByPhone(t *testing.T) {
 						AllowPush:     true,
 					}, nil
 				}
-
-				fakeRepo.GetNavActionsFn = func(ctx context.Context, role profileutils.RoleType) (*profileutils.NavigationActions, error) {
-					navs := profileutils.NavigationActions{
-						Primary: []profileutils.NavAction{
-							{
-								Title:      common.HomeNavActionTitle,
-								OnTapRoute: common.HomeRoute,
-								Icon: feedlib.Link{
-									ID:          ksuid.New().String(),
-									URL:         common.HomeNavActionURL,
-									LinkType:    feedlib.LinkTypeSvgImage,
-									Title:       common.HomeNavActionTitle,
-									Description: common.HomeNavActionDescription,
-									Thumbnail:   common.HomeNavActionURL,
-								},
-								Favourite: false,
-							},
-							{
-								Title:      common.HelpNavActionTitle,
-								OnTapRoute: common.GetHelpRouteRoute,
-								Icon: feedlib.Link{
-									ID:          ksuid.New().String(),
-									URL:         common.HelpNavActionURL,
-									LinkType:    feedlib.LinkTypeSvgImage,
-									Title:       common.HelpNavActionTitle,
-									Description: common.HelpNavActionDescription,
-									Thumbnail:   common.HelpNavActionURL,
-								},
-								Favourite: false,
-							},
+				fakeRepo.GetRolesByIDsFn = func(ctx context.Context, roleIDs []string) (*[]profileutils.Role, error) {
+					roles := []profileutils.Role{
+						{
+							ID: uuid.NewString(),
 						},
-						Secondary: []profileutils.NavAction{},
 					}
-					return &navs, nil
+					return &roles, nil
 				}
 
 			}

diff --git a/pkg/onboarding/usecases/profile_unit_test.go b/pkg/onboarding/usecases/profile_unit_test.go
@@ -3901,10 +3901,6 @@ func TestProfileUseCaseImpl_RefreshNavigationActions(t *testing.T) {
 					return &profileutils.UserProfile{}, nil
 				}
 
-				fakeRepo.GetNavActionsFn = func(ctx context.Context, role profileutils.RoleType) (*profileutils.NavigationActions, error) {
-					return &profileutils.NavigationActions{}, nil
-				}
-
 				fakeRepo.GetRolesByIDsFn = func(ctx context.Context, roleIDs []string) (*[]profileutils.Role, error) {
 					roles := []profileutils.Role{
 						{

diff --git a/pkg/onboarding/usecases/signup_unit_test.go b/pkg/onboarding/usecases/signup_unit_test.go
@@ -357,8 +357,9 @@ func TestSignUpUseCasesImpl_CreateUserByPhone(t *testing.T) {
 					return nil
 				}
 
-				fakeRepo.GetNavActionsFn = func(ctx context.Context, role profileutils.RoleType) (*profileutils.NavigationActions, error) {
-					return &profileutils.NavigationActions{}, nil
+				fakeRepo.GetRolesByIDsFn = func(ctx context.Context, roleIDs []string) (*[]profileutils.Role, error) {
+					roles := []profileutils.Role{}
+					return &roles, nil
 				}
 			}