Skip to content

Commit

Permalink
Merge branch 'dev' into dev-adrien
Browse files Browse the repository at this point in the history
  • Loading branch information
aeppling authored Nov 23, 2023
2 parents 1297aa4 + b3de8bd commit 8aef31d
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 84 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,26 @@ documentation/Documentation-Kexa.md was changed
package.json was changed


## 1.8.0-SNAPSHOT.69.12ed96c

### Files added: 0

### Files changed: 8

Kexa/services/addOn/awsGathering.service.ts was changed

Kexa/services/addOn/azureGathering.service.ts was changed

Kexa/services/addOn/gcpGathering.service.ts was changed

Kexa/services/addOn/githubGathering.service.ts was changed

Kexa/services/addOn/googleDriveGathering.service.ts was changed

Kexa/services/addOn/googleWorkspaceGathering.service.ts was changed

Kexa/services/addOn/kubernetesGathering.service.ts was changed

Kexa/services/addOn/o365Gathering.service.ts was changed


18 changes: 9 additions & 9 deletions Kexa/services/addOn/awsGathering.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ async function ec2SGListing(client: EC2, region: string): Promise<any> {
logger.debug(region + " - ec2SGListing Done");
return jsonData;
} catch (err) {
logger.error("Error in ec2SGListing: ", err);
logger.debug("Error in ec2SGListing: ", err);
return null;
}
}
Expand All @@ -189,7 +189,7 @@ async function ec2VolumesListing(client: EC2, region: string): Promise<any> {
logger.debug(region, " - ec2VolumesListing Done");
return jsonData;
} catch (err) {
logger.error("Error in ec2VolumesListing: ", err);
logger.debug("Error in ec2VolumesListing: ", err);
return null;
}
}
Expand All @@ -202,7 +202,7 @@ async function ec2InstancesListing(client: EC2, region: string): Promise<Array<E
logger.debug(region + " - ec2InstancesListing Done");
return jsonData;
} catch (err) {
logger.error("Error in ec2InstancesListing: ", err);
logger.debug("Error in ec2InstancesListing: ", err);
return null;
}
}
Expand All @@ -215,7 +215,7 @@ async function rdsInstancesListing(client: RDS, region: string): Promise<any> {
logger.debug(region + " - rdsInstancesListing Done");
return jsonData;
} catch (err) {
logger.error("Error in rdsInstancesListing: ", err);
logger.debug("Error in rdsInstancesListing: ", err);
return null;
}
}
Expand All @@ -228,7 +228,7 @@ async function resourceGroupsListing(client: ResourceGroups, region: string): Pr
logger.debug(region + " - Ressource Group Done");
return jsonData;
} catch (err) {
logger.error("Error in Ressource Group Listing: ", err);
logger.debug("Error in Ressource Group Listing: ", err);
return null;
}
}
Expand All @@ -249,7 +249,7 @@ async function tagsValueListing(client: ResourceGroupsTaggingAPI, region: string
logger.debug(region + " - Tags Done");
return jsonDataKeys;
} catch (err) {
logger.error("Error in Tags Value Listing: ", err);
logger.debug("Error in Tags Value Listing: ", err);
return null;
}
}
Expand All @@ -262,7 +262,7 @@ async function s3BucketsListing(client: S3, region: string): Promise<Array<S3> |
logger.debug(region + " - s3BucketsListing Done");
return jsonData;
} catch (err) {
logger.error("Error in s3BucketsListing: ", err);
logger.debug("Error in s3BucketsListing: ", err);
return null;
}
}
Expand All @@ -275,7 +275,7 @@ async function ecsClusterListing(client: ECS, region: string): Promise<any> {
logger.debug(region + " - ECS Done");
return jsonData;
} catch (err) {
logger.error("Error in ECS Listing: ", err);
logger.debug("Error in ECS Listing: ", err);
return null;
}
}
Expand All @@ -288,7 +288,7 @@ async function ecrImagesListing(client: ECR, region: string): Promise<any> {
logger.debug(region + " - ECR Done");
return jsonData;
} catch (err) {
logger.error("Error in ECR Listing: ", err);
logger.debug("Error in ECR Listing: ", err);
return null;
}
}
20 changes: 10 additions & 10 deletions Kexa/services/addOn/azureGathering.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export async function getSPKeyInformation(credential: DefaultAzureCredential, su
}
return resultList;
} catch (err) {
logger.error("error in getSPKeyInformation:"+err);
logger.debug("error in getSPKeyInformation:"+err);
return null;
}
}
Expand All @@ -144,7 +144,7 @@ export async function ipListing(client:NetworkManagementClient): Promise<Array<a
}
return resultList;
}catch(e){
logger.error("error in ipListing:"+e);
logger.debug("error in ipListing:"+e);
return null;
}
}
Expand All @@ -160,7 +160,7 @@ export async function aksListing(credential: DefaultAzureCredential, subscriptio
}
return resArray;
}catch(e){
logger.error("error in aksListing:"+e);
logger.debug("error in aksListing:"+e);
return null;
}
}
Expand All @@ -176,7 +176,7 @@ export async function networkSecurityGroupListing(client:NetworkManagementClient
logger.info("ended networkSecurityGroupListing");
return resultList;
} catch (err) {
logger.error("error in networkSecurityGroupListing:"+err);
logger.debug("error in networkSecurityGroupListing:"+err);
return null;
}
}
Expand All @@ -192,7 +192,7 @@ export async function virtualNetworksListing(client:NetworkManagementClient): Pr

return resultList;
} catch (err) {
logger.error("error in virtualNetworksListing:"+err);
logger.debug("error in virtualNetworksListing:"+err);
return null;
}
}
Expand All @@ -207,7 +207,7 @@ export async function networkInterfacesListing(client:NetworkManagementClient):
}
return resultList;
} catch (err) {
logger.error("error in networkInterfacesListing:"+err);
logger.debug("error in networkInterfacesListing:"+err);
return null;
}
}
Expand All @@ -222,7 +222,7 @@ export async function disksListing(client:ComputeManagementClient): Promise<Arra
}
return resultList;
} catch (err) {
logger.error("error in disksListing:"+err);
logger.debug("error in disksListing:"+err);
return null;
}
}
Expand All @@ -237,7 +237,7 @@ export async function virtualMachinesListing(client:ComputeManagementClient): Pr
}
return resultList;
}catch (err) {
logger.error("error in virtualMachinesListing:"+err);
logger.debug("error in virtualMachinesListing:"+err);
return null;
}
}
Expand All @@ -252,7 +252,7 @@ export async function resourceGroupListing(client:ResourceManagementClient): Pro
}
return resultList;
}catch (err) {
logger.error("error in resourceGroupListing:"+err);
logger.debug("error in resourceGroupListing:"+err);
return null;
}
}
Expand All @@ -274,7 +274,7 @@ export async function networkSecurityGroup_analyse(nsgList: Array<NetworkSecurit
}
return resultList;
}catch (e) {
logger.error("error"+e);
logger.debug("error"+e);
return null;
}
}
Loading

0 comments on commit 8aef31d

Please sign in to comment.