fixed uts

Author: devkimittal

332-ci-manager/service/src/main/java/io/harness/ci/execution/buildstate/CodebaseUtils.java

@@ -445,8 +445,13 @@ public ConnectorDetails getGitConnector(
       throw new CIStageExecutionException("CI codebase is mandatory in case git clone is enabled");
     }
 
-    String connectorRefValue = codeBase.getConnectorRef().getValue();
-    return getGitConnector(ngAccess, connectorRefValue, ambiance, codeBase.getRepoName().getValue());
+    String connectorRefValue = codeBase.getConneadd ctorRef().getValue();
+    String repoName = null;
+    if (codeBase.getRepoName() != null) {
+      repoName = codeBase.getRepoName().getValue();
+    }
+
+    return getGitConnector(ngAccess, connectorRefValue, ambiance, repoName);
   }
 
   public ConnectorDetails getGitConnector(

332-ci-manager/service/src/test/java/io/harness/ci/executionplan/rule/CIExecutionRule.java

@@ -13,6 +13,7 @@
 
 import static org.mockito.Mockito.mock;
 
+import io.harness.AccessControlClientConfiguration;
 import io.harness.ModuleType;
 import io.harness.SCMGrpcClientModule;
 import io.harness.ScmConnectionConfig;
@@ -178,6 +179,7 @@ protected void configure() {
                     .build());
         bind(IACMServiceClient.class).toProvider(IACMServiceClientFactory.class).in(Scopes.SINGLETON);
         bind(SSCAServiceClient.class).toInstance(mock(SSCAServiceClient.class));
+        bind(AccessControlClientConfiguration.class).toInstance(mock(AccessControlClientConfiguration.class));
       }
     });
 

332-ci-manager/service/src/test/java/io/harness/ci/integrationstage/VmInitializeTaskParamsBuilderTest.java

@@ -119,7 +119,7 @@ public void getVmInitializeTaskParams() {
 
     Map<String, String> m = new HashMap<>();
     when(codebaseUtils.getGitConnector(AmbianceUtils.getNgAccess(ambiance), initializeStepInfo.getCiCodebase(),
-             initializeStepInfo.isSkipGitClone()))
+             initializeStepInfo.isSkipGitClone(), ambiance))
         .thenReturn(null);
     when(codebaseUtils.getCodebaseVars(any(), any(), any())).thenReturn(m);
     when(
@@ -165,7 +165,7 @@ public void getHostedVmInitializeTaskParams() {
 
     Map<String, String> m = new HashMap<>();
     when(codebaseUtils.getGitConnector(AmbianceUtils.getNgAccess(ambiance), initializeStepInfo.getCiCodebase(),
-             initializeStepInfo.isSkipGitClone()))
+             initializeStepInfo.isSkipGitClone(), null))
         .thenReturn(null);
     when(codebaseUtils.getCodebaseVars(any(), any(), any())).thenReturn(m);
     when(
@@ -283,7 +283,7 @@ public void getHostedVmInitializeTaskParamsWithBareMetalEnabled() {
 
     Map<String, String> m = new HashMap<>();
     when(codebaseUtils.getGitConnector(AmbianceUtils.getNgAccess(ambiance), initializeStepInfo.getCiCodebase(),
-             initializeStepInfo.isSkipGitClone()))
+             initializeStepInfo.isSkipGitClone(), null))
         .thenReturn(null);
     when(codebaseUtils.getCodebaseVars(any(), any(), any())).thenReturn(m);
     when(

332-ci-manager/service/src/test/java/io/harness/ci/stateutils/buildstate/CodebaseUtilsTest.java

@@ -194,15 +194,15 @@ public void testGetCompleteUrlForAzureSshAccountConnector() {
   public void testGetGitConnectorSkipClone() {
     NGAccess ngAccess = Mockito.mock(NGAccess.class);
     CodeBase codeBase = CodeBase.builder().build();
-    final ConnectorDetails gitConnector = codebaseUtils.getGitConnector(ngAccess, codeBase, true);
+    final ConnectorDetails gitConnector = codebaseUtils.getGitConnector(ngAccess, codeBase, true, null);
     assertThat(gitConnector).isNull();
   }
 
   @Test(expected = CIStageExecutionException.class)
   @Owner(developers = JAMES_RICKS)
   @Category(UnitTests.class)
   public void testGetGitConnectorNullCodeBase() {
-    codebaseUtils.getGitConnector(null, null, false);
+    codebaseUtils.getGitConnector(null, null, false, null);
   }
 
   @Test
@@ -211,9 +211,10 @@ public void testGetGitConnectorNullCodeBase() {
   public void testGetGitConnectorCodebase() {
     String connectorRefValue = "myConnectorRef";
     ConnectorDetails connectorDetails = ConnectorDetails.builder().connectorType(ConnectorType.GITHUB).build();
-    when(connectorUtils.getConnectorDetails(any(), eq(connectorRefValue), eq(true))).thenReturn(connectorDetails);
+    when(connectorUtils.getConnectorDetailsWithToken(any(), eq(connectorRefValue), eq(true), any(), any()))
+        .thenReturn(connectorDetails);
     CodeBase codeBase = CodeBase.builder().connectorRef(ParameterField.createValueField(connectorRefValue)).build();
-    final ConnectorDetails gitConnector = codebaseUtils.getGitConnector(null, codeBase, false);
+    final ConnectorDetails gitConnector = codebaseUtils.getGitConnector(null, codeBase, false, null);
     assertThat(gitConnector).isEqualTo(connectorDetails);
   }
 
@@ -223,8 +224,9 @@ public void testGetGitConnectorCodebase() {
   public void testGetGitConnector() {
     String connectorRefValue = "myConnectorRef";
     ConnectorDetails connectorDetails = ConnectorDetails.builder().connectorType(ConnectorType.GITHUB).build();
-    when(connectorUtils.getConnectorDetails(any(), eq(connectorRefValue), eq(true))).thenReturn(connectorDetails);
-    final ConnectorDetails gitConnector = codebaseUtils.getGitConnector(null, connectorRefValue);
+    when(connectorUtils.getConnectorDetailsWithToken(any(), eq(connectorRefValue), eq(true), any(), any()))
+        .thenReturn(connectorDetails);
+    final ConnectorDetails gitConnector = codebaseUtils.getGitConnector(null, connectorRefValue, null, null);
     assertThat(gitConnector).isEqualTo(connectorDetails);
   }
 

332-ci-manager/service/src/test/java/io/harness/ci/stateutils/buildstate/PluginSettingUtilsTest.java

@@ -626,7 +626,7 @@ public void shouldGetGitClonePluginCompatibleStepInfoEnvVariables() {
     Integer depth = 22;
 
     ConnectorDetails connectorDetails = ConnectorDetails.builder().build();
-    when(codebaseUtils.getGitConnector(any(), eq(connectorRef))).thenReturn(connectorDetails);
+    when(codebaseUtils.getGitConnector(any(), eq(connectorRef), any(), any())).thenReturn(connectorDetails);
 
     when(ciCodebaseUtils.getGitConnector(any(), eq(connectorRef))).thenReturn(connectorDetails);
     Map<String, String> gitEnvVars = new HashMap<>();
@@ -677,7 +677,7 @@ public void shouldGetGitClonePluginCompatibleStepInfoNoCloneDirAccountUrlEnvVari
     Integer depth = 22;
 
     ConnectorDetails connectorDetails = ConnectorDetails.builder().build();
-    when(codebaseUtils.getGitConnector(any(), eq(connectorRef))).thenReturn(connectorDetails);
+    when(codebaseUtils.getGitConnector(any(), eq(connectorRef), any(), any())).thenReturn(connectorDetails);
     when(ciCodebaseUtils.getGitConnector(any(), eq(connectorRef))).thenReturn(connectorDetails);
 
     Map<String, String> gitEnvVars = new HashMap<>();
@@ -727,7 +727,7 @@ public void shouldGetGitClonePluginCompatibleStepInfoNoCloneDirRepoUrlEnvVariabl
     Integer depth = 22;
 
     ConnectorDetails connectorDetails = ConnectorDetails.builder().build();
-    when(codebaseUtils.getGitConnector(any(), eq(connectorRef))).thenReturn(connectorDetails);
+    when(codebaseUtils.getGitConnector(any(), eq(connectorRef), any(), any())).thenReturn(connectorDetails);
 
     when(ciCodebaseUtils.getGitConnector(any(), eq(connectorRef))).thenReturn(connectorDetails);
     Map<String, String> gitEnvVars = new HashMap<>();

879-pipeline-ci-commons/src/main/java/io/harness/ci/utils/BaseConnectorUtils.java

@@ -212,9 +212,9 @@ public String getSCMBaseUrl(String baseUrl) {
       String host = url.getHost();
       String protocol = url.getProtocol();
       if (host.equals("localhost")) {
-        return "http://1005-59-89-164-155.ngrok-free.app/git";
+        return "";
       }
-      return protocol + "://" + GIT_DOT + host;
+      return baseUrl + "/code/git";
     } catch (Exception e) {
       log.error("There was error while generating scm base URL", e);
     }

980-commons/src/main/java/io/harness/security/JWTTokenServiceUtils.java

@@ -168,7 +168,8 @@ public String generateJWTToken(Map<String, String> claims, Long validityDuration
     }
   }
 
-  public String generateJWTToken(Map<String, String> claims, Map<String, String[]> arrayClaims, Long validityDurationInMillis, String jwtPasswordSecret) {
+  public String generateJWTToken(Map<String, String> claims, Map<String, String[]> arrayClaims,
+      Long validityDurationInMillis, String jwtPasswordSecret) {
     if (jwtPasswordSecret == null) {
       throw new InvalidRequestException("Could not find verification secret token");
     }

pipeline-service/modules/ng-triggers/src/main/java/io/harness/ngtriggers/eventmapper/filters/impl/GitWebhookTriggerRepoFilter.java

@@ -20,8 +20,6 @@
 import static java.util.stream.Collectors.toList;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.stripEnd;
-import static org.apache.commons.lang3.StringUtils.stripStart;
 
 import io.harness.annotations.dev.OwnedBy;
 import io.harness.beans.FeatureName;