Skip to content

Commit

Permalink
lint code
Browse files Browse the repository at this point in the history 
Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
  • Loading branch information
@fahedouch
fahedouch committed Nov 9, 2020
1 parent d3fb750 commit 2bab0e3
Show file tree
Hide file tree
Showing 12 changed files with 159 additions and 157 deletions.
92 changes: 46 additions & 46 deletions client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,11 +584,11 @@ func testPushByDigest(t *testing.T, sb integration.Sandbox) {

if len(resp.ExportersResponse) > 0 {
for _, e := range resp.ExportersResponse {
desc, _, err := contentutil.ProviderFromRef(name + "@" + e.ExporterResponse["containerimage.digest"])
require.NoError(t, err)
require.Equal(t, e.ExporterResponse["containerimage.digest"], desc.Digest.String())
require.Equal(t, images.MediaTypeDockerSchema2Manifest, desc.MediaType)
require.True(t, desc.Size > 0)
desc, _, err := contentutil.ProviderFromRef(name + "@" + e.ExporterResponse["containerimage.digest"])
require.NoError(t, err)
require.Equal(t, e.ExporterResponse["containerimage.digest"], desc.Digest.String())
require.Equal(t, images.MediaTypeDockerSchema2Manifest, desc.MediaType)
require.True(t, desc.Size > 0)
}
}
}
Expand Down Expand Up @@ -853,11 +853,11 @@ func testFrontendImageNaming(t *testing.T, sb integration.Sandbox) {

resp, err := c.Build(context.TODO(), so, "", frontend, nil)
require.NoError(t, err)
if len(resp.ExportersResponse) > 0 {
for _, e := range resp.ExportersResponse {
checkImageName[exp](out, imageName, e.ExporterResponse)
}
}
if len(resp.ExportersResponse) > 0 {
for _, e := range resp.ExportersResponse {
checkImageName[exp](out, imageName, e.ExporterResponse)
}
}
})
}
})
Expand Down Expand Up @@ -1545,14 +1545,14 @@ func testFrontendMetadataReturn(t *testing.T, sb integration.Sandbox) {
},
}, "", frontend, nil)
require.NoError(t, err)
if len(res.ExportersResponse) > 0 {
for _, e := range res.ExportersResponse {
require.Contains(t, e.ExporterResponse, "frontend.returned")
require.Equal(t, e.ExporterResponse["frontend.returned"], "true")
require.NotContains(t, e.ExporterResponse, "not-frontend.not-returned")
require.NotContains(t, e.ExporterResponse, "frontendnot.returned.either")
}
}
if len(res.ExportersResponse) > 0 {
for _, e := range res.ExportersResponse {
require.Contains(t, e.ExporterResponse, "frontend.returned")
require.Equal(t, e.ExporterResponse["frontend.returned"], "true")
require.NotContains(t, e.ExporterResponse, "not-frontend.not-returned")
require.NotContains(t, e.ExporterResponse, "frontendnot.returned.either")
}
}
checkAllReleasable(t, c, sb, true)
}

Expand Down Expand Up @@ -1656,13 +1656,13 @@ func testExporterTargetExists(t *testing.T, sb integration.Sandbox) {
}, nil)
require.NoError(t, err)
if len(res.ExportersResponse) > 0 {
for _, e := range res.ExportersResponse {
dgst := e.ExporterResponse["containerimage.digest"]
for _, e := range res.ExportersResponse {
dgst := e.ExporterResponse["containerimage.digest"]

require.True(t, strings.HasPrefix(dgst, "sha256:"))
require.Equal(t, dgst, mdDgst)
}
}
require.True(t, strings.HasPrefix(dgst, "sha256:"))
require.Equal(t, dgst, mdDgst)
}
}
}

func testTarExporterWithSocket(t *testing.T, sb integration.Sandbox) {
Expand Down Expand Up @@ -2539,18 +2539,18 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) {
require.NoError(t, err)

if len(resp.ExportersResponse) > 0 && len(res.ExportersResponse) > 0 {
for _, e := range res.ExportersResponse {
for _, v := range resp.ExportersResponse {
dgst, ok := v.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)
for _, e := range res.ExportersResponse {
for _, v := range resp.ExportersResponse {
dgst, ok := v.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)

dgst2, ok := e.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)
dgst2, ok := e.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)

require.Equal(t, dgst, dgst2)
}
}
}
require.Equal(t, dgst, dgst2)
}
}
}

err = c.Prune(context.TODO(), nil, PruneAll)
require.NoError(t, err)
Expand Down Expand Up @@ -2580,22 +2580,22 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) {

if len(resp.ExportersResponse) > 0 && len(res.ExportersResponse) > 0 {
for _, e := range resp.ExportersResponse {
for _, v := range res.ExportersResponse {
dgst3, ok := v.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)
for _, v := range res.ExportersResponse {
dgst3, ok := v.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)

dgst, ok := e.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)
dgst, ok := e.ExporterResponse["containerimage.digest"]
require.Equal(t, ok, true)

unique, err := readFileInImage(c, target+"@"+dgst, "/unique")
require.NoError(t, err)
unique, err := readFileInImage(c, target+"@"+dgst, "/unique")
require.NoError(t, err)

// dgst3 != dgst, because inline cache is not exported for dgst3
unique3, err := readFileInImage(c, target+"@"+dgst3, "/unique")
require.NoError(t, err)
// dgst3 != dgst, because inline cache is not exported for dgst3
unique3, err := readFileInImage(c, target+"@"+dgst3, "/unique")
require.NoError(t, err)

require.EqualValues(t, unique, unique3)
}
require.EqualValues(t, unique, unique3)
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion client/graph.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package client
import (
"time"

digest "github.com/opencontainers/go-digest"
controlapi "github.com/moby/buildkit/api/services/control"
digest "github.com/opencontainers/go-digest"
)

type Vertex struct {
Expand Down
122 changes: 61 additions & 61 deletions client/solve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ package client
import (
"context"
"encoding/json"
"io"
"os"
"path/filepath"
"strings"
"time"

"github.com/containerd/containerd/content"
contentlocal "github.com/containerd/containerd/content/local"
controlapi "github.com/moby/buildkit/api/services/control"
Expand All @@ -21,11 +27,6 @@ import (
"github.com/sirupsen/logrus"
fstypes "github.com/tonistiigi/fsutil/types"
"golang.org/x/sync/errgroup"
"io"
"os"
"path/filepath"
"strings"
"time"
)

type SolveOpt struct {
Expand Down Expand Up @@ -55,7 +56,6 @@ type CacheOptionsEntry struct {
Attrs map[string]string
}


// Solve calls Solve on the controller.
// def must be nil if (and only if) opt.Frontend is set.
func (c *Client) Solve(ctx context.Context, def *llb.Definition, opt SolveOpt, statusChan chan *SolveStatus) (*SolveResponse, error) {
Expand Down Expand Up @@ -123,17 +123,17 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
s.Allow(a)
}

duplicate_Local_exporter := 0
duplicate_oci_exporter := 0
duplicate_docker_exporter := 0
duplicate_tar_exporter := 0
duplicateLocalExporter := 0
duplicateOciExporter := 0
duplicateDockerExporter := 0
duplicateTarExporter := 0
for _, ex := range opt.Exports {
switch ex.Type {
case ExporterLocal:
duplicate_Local_exporter++
if duplicate_Local_exporter > 1 {
return nil, errors.New("using multiple ExporterLocal is not supported")
}
duplicateLocalExporter++
if duplicateLocalExporter > 1 {
return nil, errors.New("using multiple ExporterLocal is not supported")
}
if ex.Output != nil {
return nil, errors.New("output file writer is not supported by local exporter")
}
Expand All @@ -142,17 +142,17 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
}
s.Allow(filesync.NewFSSyncTargetDir(ex.OutputDir))
case ExporterOCI, ExporterDocker, ExporterTar:
switch ex.Type {
case ExporterOCI:
duplicate_oci_exporter++
case ExporterDocker:
duplicate_docker_exporter++
case ExporterTar:
duplicate_tar_exporter++
}
if duplicate_oci_exporter > 1 || duplicate_docker_exporter > 1 || duplicate_tar_exporter > 1 {
return nil, errors.New("using multiple ExporterOCI is not supported")
}
switch ex.Type {
case ExporterOCI:
duplicateOciExporter++
case ExporterDocker:
duplicateDockerExporter++
case ExporterTar:
duplicateTarExporter++
}
if duplicateOciExporter > 1 || duplicateDockerExporter > 1 || duplicateTarExporter > 1 {
return nil, errors.New("using multiple ExporterOCI is not supported")
}
if ex.OutputDir != "" {
return nil, errors.Errorf("output directory %s is not supported by %s exporter", ex.OutputDir, ex.Type)
}
Expand Down Expand Up @@ -214,28 +214,28 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
var exportersTypes []string
var exporterType string
m := &controlapi.SolveRequest{
ExportersAttrs: []*controlapi.ExporterAttrs{},
ExporterAttrs: &controlapi.ExporterAttrs{},
}
ExportersAttrs: []*controlapi.ExporterAttrs{},
ExporterAttrs: &controlapi.ExporterAttrs{},
}
expo := &controlapi.ExporterAttrs{
ExporterAttrs: make(map[string]string),
}

if len(opt.Exports) > 1{
exporterType = ""
m.ExporterAttrs = nil
for _, ex := range opt.Exports {
exportersTypes = append(exportersTypes, ex.Type)
expo.ExporterAttrs = ex.Attrs
m.ExportersAttrs = append(m.ExportersAttrs, expo)
}
ExporterAttrs: make(map[string]string),
}

if len(opt.Exports) > 1 {
exporterType = ""
m.ExporterAttrs = nil
for _, ex := range opt.Exports {
exportersTypes = append(exportersTypes, ex.Type)
expo.ExporterAttrs = ex.Attrs
m.ExportersAttrs = append(m.ExportersAttrs, expo)
}
}
if len(opt.Exports) == 1 {
exportersTypes= nil
m.ExportersAttrs= nil
exporterType = opt.Exports[0].Type
expo.ExporterAttrs = opt.Exports[0].Attrs
m.ExporterAttrs = expo
exportersTypes = nil
m.ExportersAttrs = nil
exporterType = opt.Exports[0].Type
expo.ExporterAttrs = opt.Exports[0].Attrs
m.ExporterAttrs = expo
}

resp, err := c.controlClient().Solve(ctx, &controlapi.SolveRequest{
Expand All @@ -258,9 +258,9 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG

var exportersResponse []*controlapi.ExporterResponse
for _, v := range resp.ExportersResponse {
exportersResponse = append(exportersResponse, v)
}
res = &SolveResponse{
exportersResponse = append(exportersResponse, v)
}
res = &SolveResponse{
ExportersResponse: exportersResponse,
}
return nil
Expand Down Expand Up @@ -346,20 +346,20 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
}
// Update index.json of exported cache content store
// FIXME(AkihiroSuda): dedupe const definition of cache/remotecache.ExporterResponseManifestDesc = "cache.manifest"
if len(res.ExportersResponse) > 0 {
for _, v := range res.ExportersResponse {
if manifestDescJSON := v.ExporterResponse["cache.manifest"]; manifestDescJSON != "" {
var manifestDesc ocispec.Descriptor
if err = json.Unmarshal([]byte(manifestDescJSON), &manifestDesc); err != nil {
return nil, err
}
for indexJSONPath, tag := range cacheOpt.indicesToUpdate {
if err = ociindex.PutDescToIndexJSONFileLocked(indexJSONPath, manifestDesc, tag); err != nil {
return nil, err
}
}
}
}
if len(res.ExportersResponse) > 0 {
for _, v := range res.ExportersResponse {
if manifestDescJSON := v.ExporterResponse["cache.manifest"]; manifestDescJSON != "" {
var manifestDesc ocispec.Descriptor
if err = json.Unmarshal([]byte(manifestDescJSON), &manifestDesc); err != nil {
return nil, err
}
for indexJSONPath, tag := range cacheOpt.indicesToUpdate {
if err = ociindex.PutDescToIndexJSONFileLocked(indexJSONPath, manifestDesc, tag); err != nil {
return nil, err
}
}
}
}
}
return res, nil
}
Expand Down
20 changes: 10 additions & 10 deletions cmd/buildctl/build/output.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ func parseOutputCSV(s string) (client.ExportEntry, error) {

// ParseOutput parses --output
func ParseOutput(exports []string) ([]client.ExportEntry, error) {
var entries []client.ExportEntry
if (len(exports) > 0){
exportsField := strings.Fields(exports[0])
for _, s := range exportsField {
e, err := parseOutputCSV(s)
if err != nil {
return nil, err
}
entries = append(entries, e)
}
var entries []client.ExportEntry
if len(exports) > 0 {
exportsField := strings.Fields(exports[0])
for _, s := range exportsField {
e, err := parseOutputCSV(s)
if err != nil {
return nil, err
}
entries = append(entries, e)
}
}
return entries, nil
}
Expand Down
Loading

0 comments on commit 2bab0e3

Please sign in to comment.