Skip to content

Commit 205b336

Browse files
authored
Merge pull request #26 from The-Debarghya/main
Fix format errors
2 parents 3a272f9 + 4d2f091 commit 205b336

File tree

28 files changed

+100
-109
lines changed

28 files changed

+100
-109
lines changed

.github/workflows/go-lint-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ jobs:
4646
run: staticcheck ./...
4747

4848
- name: Run format checks
49-
run: gofmt -l -d .
49+
run: gofmt -l -d -e .

container_manager/image.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func (m Manager) CreateImage(dockerfile string, buildargs map[string]string, codepath string, imagename string) (*bufio.Scanner, error) {
1313
// Move the dockerfile to the codepath
14-
err := os.WriteFile(codepath+"/Dockerfile",[]byte(dockerfile), 0777)
14+
err := os.WriteFile(codepath+"/Dockerfile", []byte(dockerfile), 0777)
1515
if err != nil {
1616
return nil, errors.New("failed to write the dockerfile")
1717
}
@@ -32,13 +32,13 @@ func (m Manager) CreateImage(dockerfile string, buildargs map[string]string, cod
3232
// Build the image
3333
response, err := m.client.ImageBuild(m.ctx, tar, types.ImageBuildOptions{
3434
Dockerfile: "Dockerfile",
35-
Remove: true,
36-
Tags: []string{imagename},
37-
BuildArgs: final_buildargs,
35+
Remove: true,
36+
Tags: []string{imagename},
37+
BuildArgs: final_buildargs,
3838
})
3939
if err != nil {
4040
return nil, errors.New("failed to build the image")
4141
}
4242
scanner := bufio.NewScanner(response.Body)
4343
return scanner, nil
44-
}
44+
}

container_manager/network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
// Create a new network
1010
func (m Manager) CreateNetwork(name string) error {
1111
_, err := m.client.NetworkCreate(m.ctx, name, types.NetworkCreate{
12-
Driver: "overlay",
12+
Driver: "overlay",
1313
Attachable: true,
1414
})
1515
if err != nil {
@@ -49,4 +49,4 @@ func (m Manager) GatewayNetwork(name string) (string, error) {
4949
return "", errors.New("error inspecting network ")
5050
}
5151
return network.IPAM.Config[0].Gateway, nil
52-
}
52+
}

container_manager/ports.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (m Manager) UpdatePublishedHostPorts(service_name string, ports []swarm.Por
2828
serviceData.Endpoint.Ports = ports
2929
serviceData.Spec.EndpointSpec.Mode = swarm.ResolutionModeVIP
3030
serviceData.Spec.EndpointSpec.Ports = ports
31-
_, err= m.client.ServiceUpdate(m.ctx, service_name, serviceData.Version, serviceData.Spec, types.ServiceUpdateOptions{})
31+
_, err = m.client.ServiceUpdate(m.ctx, service_name, serviceData.Version, serviceData.Spec, types.ServiceUpdateOptions{})
3232
if err != nil {
3333
return errors.New("error updating service")
3434
}

container_manager/service.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ func (m Manager) StatusService(serviceName string) (ServiceStatus, error) {
7777
return ServiceStatus{}, errors.New("error getting service status")
7878
}
7979

80-
var updateStatus ServiceUpdateStatus;
80+
var updateStatus ServiceUpdateStatus
8181
if serviceData.UpdateStatus != nil {
82-
var state ServiceUpdateState;
82+
var state ServiceUpdateState
8383
switch serviceData.UpdateStatus.State {
8484
case swarm.UpdateStateUpdating:
8585
state = ServiceUpdateStateUpdating
@@ -97,7 +97,7 @@ func (m Manager) StatusService(serviceName string) (ServiceStatus, error) {
9797
state = ServiceUpdateStateUnknown
9898
}
9999
updateStatus = ServiceUpdateStatus{
100-
State: state,
100+
State: state,
101101
Message: serviceData.UpdateStatus.Message,
102102
}
103103
}
@@ -122,9 +122,9 @@ func (m Manager) StatusService(serviceName string) (ServiceStatus, error) {
122122
desiredReplicas = int(*serviceData.Spec.Mode.Replicated.Replicas)
123123
}
124124
return ServiceStatus{
125-
DesiredReplicas: desiredReplicas,
126-
RunningReplicas: runningReplicas,
127-
LastUpdatedAt: serviceData.UpdatedAt.String(),
125+
DesiredReplicas: desiredReplicas,
126+
RunningReplicas: runningReplicas,
127+
LastUpdatedAt: serviceData.UpdatedAt.String(),
128128
ServiceUpdateStatus: updateStatus,
129129
}, nil
130130
}
@@ -134,9 +134,9 @@ func (m Manager) LogsService(serviceName string, since string, until string) (io
134134
logs, err := m.client.ServiceLogs(m.ctx, serviceName, types.ContainerLogsOptions{
135135
ShowStdout: true,
136136
ShowStderr: true,
137-
Follow: false,
138-
Since: since,
139-
Until: until,
137+
Follow: false,
138+
Since: since,
139+
Until: until,
140140
})
141141
if err != nil {
142142
return nil, errors.New("error getting service logs")
@@ -158,7 +158,7 @@ func (m Manager) serviceToServiceSpec(service Service) swarm.ServiceSpec {
158158
volumeMounts := []mount.Mount{}
159159
for _, volumeMount := range service.VolumeMounts {
160160
volumeMounts = append(volumeMounts, mount.Mount{
161-
Type: mount.TypeVolume,
161+
Type: mount.TypeVolume,
162162
Source: volumeMount.Source,
163163
Target: volumeMount.Target,
164164
ReadOnly: volumeMount.ReadOnly,

container_manager/types.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ type Service struct {
2424
}
2525

2626
type ServiceStatus struct {
27-
DesiredReplicas int `json:"desiredreplicas"`
28-
RunningReplicas int `json:"runningreplicas"`
29-
LastUpdatedAt string `json:"lastupdatedat"`
27+
DesiredReplicas int `json:"desiredreplicas"`
28+
RunningReplicas int `json:"runningreplicas"`
29+
LastUpdatedAt string `json:"lastupdatedat"`
3030
ServiceUpdateStatus ServiceUpdateStatus `json:"serviceupdatestatus,omitempty"`
3131
}
3232

3333
type ServiceUpdateStatus struct {
34-
State ServiceUpdateState `json:"state"`
35-
Message string `json:"message"`
34+
State ServiceUpdateState `json:"state"`
35+
Message string `json:"message"`
3636
}
3737

3838
type ServiceUpdateState string
3939

4040
const (
41-
ServiceUpdateStateUpdating ServiceUpdateState = "updating"
42-
ServiceUpdateStatePaused ServiceUpdateState = "paused"
43-
ServiceUpdateStateCompleted ServiceUpdateState = "completed"
44-
ServiceUpdateStateRollbackStarted ServiceUpdateState = "rollback_started"
45-
ServiceUpdateStateRollbackPaused ServiceUpdateState = "rollback_paused"
41+
ServiceUpdateStateUpdating ServiceUpdateState = "updating"
42+
ServiceUpdateStatePaused ServiceUpdateState = "paused"
43+
ServiceUpdateStateCompleted ServiceUpdateState = "completed"
44+
ServiceUpdateStateRollbackStarted ServiceUpdateState = "rollback_started"
45+
ServiceUpdateStateRollbackPaused ServiceUpdateState = "rollback_paused"
4646
ServiceUpdateStateRollbackCompleted ServiceUpdateState = "rollback_completed"
47-
ServiceUpdateStateUnknown ServiceUpdateState = "unknown"
47+
ServiceUpdateStateUnknown ServiceUpdateState = "unknown"
4848
)
4949

5050
// Volume Mount

container_manager/volume.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func (m Manager) FetchVolumes() ([]string, error) {
4141
return nil, errors.New("error fetching volumes " + err.Error())
4242
}
4343
var volumeNames []string = make([]string, len(volumes.Volumes))
44-
for i , v := range volumes.Volumes {
44+
for i, v := range volumes.Volumes {
4545
volumeNames[i] = v.Name
4646
}
4747
return volumeNames, nil
48-
}
48+
}

docker_config_generator/constructor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ func (m *Manager) Init() error {
2121
// Load templates
2222
m.DockerTemplates = map[string]string{}
2323
for service, template := range m.Config.Templates {
24-
data, err := templateFolder.ReadFile("templates/"+template.Name)
24+
data, err := templateFolder.ReadFile("templates/" + template.Name)
2525
if err != nil {
26-
return errors.New("failed to read template : "+template.Name)
26+
return errors.New("failed to read template : " + template.Name)
2727
}
2828
m.DockerTemplates[service] = string(data)
2929
}

docker_config_generator/helper.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func ExtractTar(tarFile string, destFolder string) error {
4848
return err
4949
}
5050
}
51-
51+
5252
// Create tar reader
5353
tr := tar.NewReader(reader)
5454

@@ -100,28 +100,27 @@ func ExtractTar(tarFile string, destFolder string) error {
100100
}
101101

102102
func createDirectoriesIfNotExist(filePath string) error {
103-
dir := filepath.Dir(filePath)
104-
return os.MkdirAll(dir, 0755) // 0755 sets the permissions for the new directories
103+
dir := filepath.Dir(filePath)
104+
return os.MkdirAll(dir, 0755) // 0755 sets the permissions for the new directories
105105
}
106106

107107
func createFileWithDirectories(filePath string, fileMode os.FileMode) (*os.File, error) {
108-
if err := createDirectoriesIfNotExist(filePath); err != nil {
109-
return nil, err
110-
}
108+
if err := createDirectoriesIfNotExist(filePath); err != nil {
109+
return nil, err
110+
}
111111

112-
file, err := os.OpenFile(filePath, os.O_CREATE|os.O_RDWR, fileMode)
113-
if err != nil {
114-
return nil, err
115-
}
112+
file, err := os.OpenFile(filePath, os.O_CREATE|os.O_RDWR, fileMode)
113+
if err != nil {
114+
return nil, err
115+
}
116116

117-
return file, nil
117+
return file, nil
118118
}
119119

120120
func deleteDirectory(dir string) {
121121
os.RemoveAll(dir)
122122
}
123123

124-
125124
// Check if a file exists in folder
126125
func existsInFolder(destFolder string, file string) bool {
127126
path := filepath.Join(destFolder, file)

docker_config_generator/types.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type IdentifierSelector struct {
4040

4141
// DockerFile Config
4242
type DockerFileConfig struct {
43-
DetectedService string `json:"detected_service"`
44-
DockerFile string `json:"docker_file"`
45-
Variables map[string]Variable `json:"variables"`
46-
}
43+
DetectedService string `json:"detected_service"`
44+
DockerFile string `json:"docker_file"`
45+
Variables map[string]Variable `json:"variables"`
46+
}

0 commit comments

Comments
 (0)