Associate project for every organisation fetched

components/automate-ui/src/app/modules/infra-proxy/update-web-uikey-slider/update-web-uikey-slider.component.spec.ts

@@ -0,0 +1,146 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng2-mock-component';
+import { ReactiveFormsModule, FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { UpdateWebUIKeySliderComponent } from './update-web-uikey-slider.component';
+import { StoreModule, Store } from '@ngrx/store';
+import { NgrxStateAtom, ngrxReducers, runtimeChecks } from 'app/ngrx.reducers';
+import { HttpClient, HttpHandler } from '@angular/common/http';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { Regex } from 'app/helpers/auth/regex';
+import { using } from 'app/testing/spec-helpers';
+import { WebUIKey } from 'app/entities/servers/server.model';
+import { UpdateWebUIKeyFailure, UpdateWebUIKeySuccess } from 'app/entities/servers/server.actions';
+import { HttpStatus } from 'app/types/types';
+import { HttpErrorResponse } from '@angular/common/http';
+
+describe('UpdateWebUIKeySliderComponent', () => {
+  let component: UpdateWebUIKeySliderComponent;
+  let fixture: ComponentFixture<UpdateWebUIKeySliderComponent>;
+
+  let updateKeyForm: FormGroup;
+  let errors = {};
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [
+        MockComponent({ selector: 'chef-button', inputs: ['disabled'] }),
+        MockComponent({ selector: 'chef-error' }),
+        MockComponent({ selector: 'chef-icon' }),
+        MockComponent({ selector: 'chef-form-field' }),
+        MockComponent({ selector: 'chef-loading-spinner' }),
+        UpdateWebUIKeySliderComponent
+      ],
+        imports: [
+        ReactiveFormsModule,
+        StoreModule.forRoot(ngrxReducers, { runtimeChecks })
+        ],
+        providers: [
+          HttpClient,
+          HttpHandler
+        ],
+        schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
+      })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UpdateWebUIKeySliderComponent);
+    component = fixture.componentInstance;
+    component.updateWebuiKeyForm = new FormBuilder().group({
+      webuikey: ['', [Validators.required, Validators.pattern(Regex.patterns.NON_BLANK),
+        Validators.pattern(Regex.patterns.NO_WILDCARD_ALLOW_HYPHEN)]]
+    });
+    updateKeyForm = component.updateWebuiKeyForm;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('form validity', () => {
+    describe('the form should be invalid', () => {
+      it('when all inputs are empty', () => {
+        expect(updateKeyForm.valid).toBeFalsy();
+      });
+
+      it('when webuikey is missing', () => {
+
+        errors = updateKeyForm.controls['webuikey'].errors || {};
+
+        expect(updateKeyForm.valid).toBeFalsy();
+        expect(errors['required']).toBeTruthy();
+      });
+    });
+
+    describe('the form should be valid', () => {
+      it('when all inputs are filled and valid', () => {
+        expect(updateKeyForm.valid).toBeFalsy();
+        updateKeyForm.controls['webuikey'].setValue('WebUIKey');
+        expect(updateKeyForm.valid).toBeTruthy();
+      });
+
+      using([
+        ['contains numbers range 0-9.', 'WebUIKey123'],
+        ['contains alphabets a-z', 'WebUIKey-test'],
+        ['contains underscore.', 'WebUIKey_test'],
+        ['contains hyphen, minus, or dash.', 'WebUIKey_test-1'],
+        ['has mixed characters', 'WebUIKey-Test_10']
+      ], function (description: string, input: string) {
+        it(('when the webuikey ' + description), () => {
+
+          updateKeyForm.controls['webuikey'].setValue(input);
+          errors = updateKeyForm.controls['webuikey'].errors || {};
+
+          expect(updateKeyForm.valid).toBeTruthy();
+          expect(errors['pattern']).toBeFalsy();
+        });
+      });
+    });
+  });
+
+  describe('#webuikey', () => {
+    let store: Store<NgrxStateAtom>;
+    const webuikey: WebUIKey = {
+      id: 'test_server',
+      webui_key: 'test_webuikey'
+    };
+
+    beforeEach(() => {
+      store = TestBed.inject(Store);
+    });
+
+    it('render the UI Key Slider', () => {
+      component.slidePanel();
+      expect(component.isSlideOpen).toBe(true);
+    });
+
+    it('should be invalid when no fields are filled out', () => {
+      expect(component.updateWebuiKeyForm.valid).toBeFalsy();
+    });
+
+    it('should be valid when all fields are filled out', () => {
+      component.updateWebuiKeyForm.controls['webuikey'].setValue(webuikey.webui_key);
+      expect(component.updateWebuiKeyForm.valid).toBeTruthy();
+    });
+
+    it('hide slider after updating webuikey.', () => {
+      component.updateWebuiKeyForm.controls['webuikey'].setValue(webuikey.webui_key);
+      component.updateWebUIkey();
+
+      store.dispatch(new UpdateWebUIKeySuccess(webuikey));
+    });
+
+    it('on create , slider is closed with failure banner', () => {
+      component.updateWebuiKeyForm.controls['webuikey'].setValue(webuikey.webui_key);
+      component.updateWebUIkey();
+
+      const error = <HttpErrorResponse>{
+        status: HttpStatus.INTERNAL_SERVER_ERROR,
+        ok: false
+      };
+      store.dispatch(new UpdateWebUIKeyFailure(error));
+      expect(component.conflictError).toBe(false);
+    });
+  });
+});

components/infra-proxy-service/cmd/infra-proxy-service/commands/serve.go

@@ -86,6 +86,8 @@ func serve(cmd *cobra.Command, args []string) {
 	}
 	authzClient := authz.NewAuthorizationServiceClient(authzConn)
 
+	authzProjectClient := authz.NewProjectsServiceClient(authzConn)
+
 	if cfg.SecretsAddress == "" {
 		fail(errors.New("missing required config secrets_address"))
 	}
@@ -97,7 +99,8 @@ func serve(cmd *cobra.Command, args []string) {
 	// get secrets client
 	secretsClient := secrets.NewSecretsServiceClient(secretsConn)
 
-	service, err := service.Start(l, migrationConfig, connFactory, secretsClient, authzClient)
+	service, err := service.Start(l, migrationConfig, connFactory, secretsClient, authzClient, authzProjectClient)
+
 	if err != nil {
 		fail(errors.Wrap(err, "could not initialize storage"))
 	}

components/infra-proxy-service/config/service.go

@@ -87,6 +87,8 @@ func ConfigFromViper(configFile string) (*service.Service, error) {
 	}
 	authzClient := authz.NewAuthorizationServiceClient(authzConn)
 
+	authzProjectClient := authz.NewProjectsServiceClient(authzConn)
+
 	if cfg.SecretsAddress == "" {
 		fail(errors.New("missing required config secrets_address"))
 	}
@@ -98,7 +100,7 @@ func ConfigFromViper(configFile string) (*service.Service, error) {
 	// gets secrets client
 	secretsClient := secrets.NewSecretsServiceClient(secretsConn)
 
-	service, err := service.Start(l, migrationConfig, connFactory, secretsClient, authzClient)
+	service, err := service.Start(l, migrationConfig, connFactory, secretsClient, authzClient, authzProjectClient)
 	if err != nil {
 		fail(errors.Wrap(err, "could not initialize storage"))
 	}

components/infra-proxy-service/server/orgs.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/chef/automate/api/external/common/query"
 	secrets "github.com/chef/automate/api/external/secrets"
+	"github.com/chef/automate/api/interservice/authz"
 	"github.com/chef/automate/api/interservice/infra_proxy/request"
 	"github.com/chef/automate/api/interservice/infra_proxy/response"
 	"github.com/chef/automate/components/infra-proxy-service/service"
@@ -240,7 +241,11 @@ func (s *Server) GetInfraServerOrgs(ctx context.Context, req *request.GetInfraSe
 	// Save organisations in backend DB
 	orgs := []storage.Org{}
 	for key := range orgsList {
-		org, err := s.service.Storage.StoreOrg(ctx, key, key, "", "", req.ServerId, nil)
+		projects, err := createProjectFromOrgIdAndServerID(s, ctx, req.ServerId, key)
+		if err != nil {
+			return nil, err
+		}
+		org, err := s.service.Storage.StoreOrg(ctx, key, key, "", "", req.ServerId, projects)
 		if err != nil {
 			return nil, service.ParseStorageError(err, *req, "org")
 		}
@@ -274,3 +279,20 @@ func fromStorageToListOrgs(sl []storage.Org) []*response.Org {
 
 	return tl
 }
+
+//function to create a new iam project for each client
+func createProjectFromOrgIdAndServerID(s *Server, ctx context.Context, serverId string, orgId string) ([]string, error) {
+
+	newProject := &authz.CreateProjectReq{
+		Name:         serverId + "_" + orgId,
+		Id:           serverId + "_" + orgId,
+		SkipPolicies: false,
+	}
+
+	projectID, err := s.service.AuthzProject.CreateProject(ctx, newProject)
+	if err != nil {
+		return nil, err
+	}
+
+	return []string{projectID.Project.Name}, nil
+}

components/infra-proxy-service/service/service.go

@@ -18,25 +18,27 @@ import (
 
 // Service holds the internal state and configuration of the Infra proxy service.
 type Service struct {
-	Logger      logger.Logger
-	ConnFactory *secureconn.Factory
-	Storage     storage.Storage
-	Secrets     secrets.SecretsServiceClient
+	Logger       logger.Logger
+	ConnFactory  *secureconn.Factory
+	Storage      storage.Storage
+	Secrets      secrets.SecretsServiceClient
+	AuthzProject authz.ProjectsServiceClient
 }
 
 // Start returns an instance of Service that connects to a postgres storage backend.
 func Start(l logger.Logger, migrationsConfig migration.Config, connFactory *secureconn.Factory, secretsClient secrets.SecretsServiceClient,
-	authzClient authz.AuthorizationServiceClient) (*Service, error) {
+	authzClient authz.AuthorizationServiceClient, authzProjectClient authz.ProjectsServiceClient) (*Service, error) {
 	p, err := postgres.New(l, migrationsConfig, authzClient)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Service{
-		Logger:      l,
-		ConnFactory: connFactory,
-		Storage:     p,
-		Secrets:     secretsClient,
+		Logger:       l,
+		ConnFactory:  connFactory,
+		Storage:      p,
+		Secrets:      secretsClient,
+		AuthzProject: authzProjectClient,
 	}, nil
 }
 

components/infra-proxy-service/test/test.go

@@ -112,6 +112,8 @@ func SetupInfraProxyService(ctx context.Context,
 
 	authzClient := authz.NewAuthorizationServiceClient(authzConn)
 
+	authzProjectClient := authz.NewProjectsServiceClient(authzConn)
+
 	secretsClient := secrets.NewMockSecretsServiceClient(gomock.NewController(t))
 
 	l, err := logger.NewLogger("text", "debug")
@@ -120,7 +122,7 @@ func SetupInfraProxyService(ctx context.Context,
 	migrationConfig, err := migrationConfigIfPGTestsToBeRun(l, "../storage/postgres/migration/sql")
 	require.NoError(t, err)
 
-	serviceRef, err := service.Start(l, *migrationConfig, connFactory, secretsClient, authzClient)
+	serviceRef, err := service.Start(l, *migrationConfig, connFactory, secretsClient, authzClient, authzProjectClient)
 
 	if err != nil {
 		t.Fatalf("could not create server: %s", err)

e2e/cypress/integration/api/iam/infra_viewer_actions.spec.ts

@@ -196,4 +196,4 @@ describe('Infra Viewer Policy', () => {
             assert.equal(resp.status, 403);
         });
     });
-});
+});

e2e/cypress/integration/ui/infra-proxy/chef-server-details.spec.ts

@@ -62,7 +62,7 @@ describe('chef server details', () => {
       cy.get('[data-cy=update-web-ui-key]').contains('Update').click();
       cy.get('app-chef-server-details .sidenav-header').should('exist');
       cy.get('[data-cy=enter-webui-key]').type(webuiKey);
-
+      
       cy.get('[data-cy=update-webui-key-button]').click();
       cy.get('app-chef-server-details .sidenav-header').should('not.be.visible');
     });