Merge pull request #182 from devtron-labs/azure-blob

ci log handling

Author: nishant-d

Gopkg.lock

@@ -55,6 +55,7 @@ type CdHandlerImpl struct {
 	Logger                       *zap.SugaredLogger
 	cdService                    CdWorkflowService
 	cdConfig                     *CdConfig
+	ciConfig                     *CiConfig
 	userService                  user.UserService
 	ciLogService                 CiLogService
 	ciArtifactRepository         repository.CiArtifactRepository
@@ -73,7 +74,8 @@ func NewCdHandlerImpl(Logger *zap.SugaredLogger, cdConfig *CdConfig, userService
 	ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository,
 	pipelineRepository pipelineConfig.PipelineRepository,
 	envRepository cluster.EnvironmentRepository,
-	ciWorkflowRepository pipelineConfig.CiWorkflowRepository) *CdHandlerImpl {
+	ciWorkflowRepository pipelineConfig.CiWorkflowRepository,
+	ciConfig *CiConfig) *CdHandlerImpl {
 	return &CdHandlerImpl{
 		Logger:                       Logger,
 		cdConfig:                     cdConfig,
@@ -86,6 +88,7 @@ func NewCdHandlerImpl(Logger *zap.SugaredLogger, cdConfig *CdConfig, userService
 		envRepository:                envRepository,
 		pipelineRepository:           pipelineRepository,
 		ciWorkflowRepository:         ciWorkflowRepository,
+		ciConfig:                     ciConfig,
 	}
 }
 
@@ -326,9 +329,16 @@ func (impl *CdHandlerImpl) getLogsFromRepository(pipelineId int, cdWorkflow *pip
 		WorkflowName: cdWorkflow.Name,
 		//AccessKey:    cdConfig,
 		//SecretKet:    cdWorkflow.CdPipeline.CiTemplate.DockerRegistry.AWSSecretAccessKey,
-		Region:       cdConfig.CdCacheRegion,
-		LogsBucket:   cdConfig.LogsBucket,
-		LogsFilePath: cdWorkflow.LogLocation, // impl.cdConfig.DefaultBuildLogsKeyPrefix + "/" + cdWorkflow.Name + "/main.log", //TODO - fixme
+		Region:        cdConfig.CdCacheRegion,
+		LogsBucket:    cdConfig.LogsBucket,
+		LogsFilePath:  cdWorkflow.LogLocation, // impl.cdConfig.DefaultBuildLogsKeyPrefix + "/" + cdWorkflow.Name + "/main.log", //TODO - fixme
+		CloudProvider: impl.ciConfig.CloudProvider,
+		AzureBlobConfig: &AzureBlobConfig{
+			Enabled:       true,
+			AccountName:   impl.ciConfig.AzureAccountName,
+			BlobContainer: impl.ciConfig.AzureBlobContainer,
+			AccountKey:    impl.ciConfig.AzureAccountKey,
+		},
 	}
 	impl.Logger.Infow("s3 log req ", "req", cdLogRequest)
 	oldLogsStream, cleanUp, err := impl.ciLogService.FetchLogs(cdLogRequest)

pkg/pipeline/CdHandler.go

@@ -559,14 +559,21 @@ func (impl *CiHandlerImpl) getLogsFromRepository(pipelineId int, ciWorkflow *pip
 		ciConfig.CiCacheRegion = impl.ciConfig.DefaultCacheBucketRegion
 	}
 	ciLogRequest := CiLogRequest{
-		PipelineId:   ciWorkflow.CiPipelineId,
-		WorkflowId:   ciWorkflow.Id,
-		WorkflowName: ciWorkflow.Name,
-		AccessKey:    ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSAccessKeyId,
-		SecretKet:    ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSSecretAccessKey,
-		Region:       ciConfig.CiCacheRegion,
-		LogsBucket:   ciConfig.LogsBucket,
-		LogsFilePath: impl.ciConfig.DefaultBuildLogsKeyPrefix + "/" + ciWorkflow.Name + "/main.log",
+		PipelineId:    ciWorkflow.CiPipelineId,
+		WorkflowId:    ciWorkflow.Id,
+		WorkflowName:  ciWorkflow.Name,
+		AccessKey:     ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSAccessKeyId,
+		SecretKet:     ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSSecretAccessKey,
+		Region:        ciConfig.CiCacheRegion,
+		LogsBucket:    ciConfig.LogsBucket,
+		LogsFilePath:  impl.ciConfig.DefaultBuildLogsKeyPrefix + "/" + ciWorkflow.Name + "/main.log",
+		CloudProvider: impl.ciConfig.CloudProvider,
+		AzureBlobConfig: &AzureBlobConfig{
+			Enabled:       true,
+			AccountName:   impl.ciConfig.AzureAccountName,
+			BlobContainer: impl.ciConfig.AzureBlobContainer,
+			AccountKey:    impl.ciConfig.AzureAccountKey,
+		},
 	}
 	oldLogsStream, cleanUp, err := impl.ciLogService.FetchLogs(ciLogRequest)
 	if err != nil {
@@ -649,14 +656,21 @@ func (impl *CiHandlerImpl) GetHistoricBuildLogs(pipelineId int, workflowId int,
 		ciConfig.LogsBucket = impl.ciConfig.DefaultBuildLogsBucket
 	}
 	ciLogRequest := CiLogRequest{
-		PipelineId:   ciWorkflow.CiPipelineId,
-		WorkflowId:   ciWorkflow.Id,
-		WorkflowName: ciWorkflow.Name,
-		AccessKey:    ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSAccessKeyId,
-		SecretKet:    ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSSecretAccessKey,
-		Region:       ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSRegion,
-		LogsBucket:   ciConfig.LogsBucket,
-		LogsFilePath: ciWorkflow.LogLocation,
+		PipelineId:    ciWorkflow.CiPipelineId,
+		WorkflowId:    ciWorkflow.Id,
+		WorkflowName:  ciWorkflow.Name,
+		AccessKey:     ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSAccessKeyId,
+		SecretKet:     ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSSecretAccessKey,
+		Region:        ciWorkflow.CiPipeline.CiTemplate.DockerRegistry.AWSRegion,
+		LogsBucket:    ciConfig.LogsBucket,
+		LogsFilePath:  ciWorkflow.LogLocation,
+		CloudProvider: impl.ciConfig.CloudProvider,
+		AzureBlobConfig: &AzureBlobConfig{
+			Enabled:       true,
+			AccountName:   impl.ciConfig.AzureAccountName,
+			BlobContainer: impl.ciConfig.AzureBlobContainer,
+			AccountKey:    impl.ciConfig.AzureAccountKey,
+		},
 	}
 	logsFile, cleanUp, err := impl.ciLogService.FetchLogs(ciLogRequest)
 	logs, err := ioutil.ReadFile(logsFile.Name())