Skip to content

Commit 4b60861

Browse files
committed
fix linters
Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
1 parent f97276d commit 4b60861

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

cmd/compose/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ func runHash(ctx context.Context, dockerCli command.Cli, opts configOptions) err
348348
}
349349

350350
hash, err := compose.ServiceHash(s)
351-
352351
if err != nil {
353352
return err
354353
}

pkg/compose/hash.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func ServiceConfigsHash(project *types.Project, serviceConfig types.ServiceConfi
5252
for _, config := range serviceConfig.Configs {
5353
file := project.Configs[config.Source]
5454
b, err := createTarForConfig(project, types.FileReferenceConfig(config), types.FileObjectConfig(file))
55-
5655
if err != nil {
5756
return nil, err
5857
}
@@ -69,7 +68,6 @@ func ServiceSecretsHash(project *types.Project, serviceConfig types.ServiceConfi
6968
for _, secret := range serviceConfig.Secrets {
7069
file := project.Secrets[secret.Source]
7170
b, err := createTarForConfig(project, types.FileReferenceConfig(secret), types.FileObjectConfig(file))
72-
7371
if err != nil {
7472
return nil, err
7573
}
@@ -114,21 +112,21 @@ func createTarForConfig(
114112

115113
// NetworkHash computes the configuration hash for a network.
116114
func NetworkHash(o *types.NetworkConfig) (string, error) {
117-
bytes, err := json.Marshal(o)
115+
data, err := json.Marshal(o)
118116
if err != nil {
119117
return "", err
120118
}
121-
return digest.SHA256.FromBytes(bytes).Encoded(), nil
119+
return digest.SHA256.FromBytes(data).Encoded(), nil
122120
}
123121

124122
// VolumeHash computes the configuration hash for a volume.
125123
func VolumeHash(o types.VolumeConfig) (string, error) {
126124
if o.Driver == "" { // (TODO: jhrotko) This probably should be fixed in compose-go
127125
o.Driver = "local"
128126
}
129-
bytes, err := json.Marshal(o)
127+
data, err := json.Marshal(o)
130128
if err != nil {
131129
return "", err
132130
}
133-
return digest.SHA256.FromBytes(bytes).Encoded(), nil
131+
return digest.SHA256.FromBytes(data).Encoded(), nil
134132
}

pkg/utils/tar.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ func CreateTarByPath(path string, modTime time.Time) (*bytes.Buffer, error) {
123123

124124
return nil
125125
})
126-
127126
if err != nil {
128127
return nil, err
129128
}

0 commit comments

Comments
 (0)