You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2018/11/15 21:04:13 UTC
[camel-k] branch master updated: chore(builder): remove unused
fields, bettern naming
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 6d2fae1 chore(builder): remove unused fields, bettern naming
6d2fae1 is described below
commit 6d2fae15f44c42e7d7f06d2adc205ce0b33c5ef1
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Nov 15 22:03:58 2018 +0100
chore(builder): remove unused fields, bettern naming
---
pkg/builder/builder.go | 26 ++++++++++----------------
pkg/builder/builder_steps.go | 8 ++++----
pkg/builder/builder_types.go | 34 +++++++++++++++++++++-------------
3 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index 45da05f..1b452b4 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -27,8 +27,6 @@ import (
"sync/atomic"
"time"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
-
"github.com/sirupsen/logrus"
)
@@ -123,26 +121,23 @@ func (b *defaultBuilder) submit(request Request) {
// update the status
r := result.(Result)
r.Status = StatusStarted
- r.ProcessStartedAt = time.Now()
+ r.Task.StartedAt = time.Now()
// create tmp path
- tmp, err := ioutil.TempDir(os.TempDir(), "builder-")
+ builderPath, err := ioutil.TempDir(os.TempDir(), "builder-")
if err != nil {
r.Status = StatusError
r.Error = err
}
- os.RemoveAll(tmp)
+ os.RemoveAll(builderPath)
// update the cache
b.request.Store(request.Identifier, r)
c := Context{
C: b.ctx,
- Values: make(map[string]interface{}),
- Path: tmp,
- Libraries: make([]v1alpha1.Artifact, 0),
- StepsDone: make([]string, 0),
+ Path: builderPath,
Namespace: b.namespace,
Request: request,
}
@@ -169,12 +164,11 @@ func (b *defaultBuilder) submit(request Request) {
l.Infof("executing step")
- now := time.Now()
+ start := time.Now()
c.Error = step.Execute(&c)
if c.Error == nil {
- c.StepsDone = append(c.StepsDone, step.ID())
- l.Infof("step done in %f seconds", time.Now().Sub(now).Seconds())
+ l.Infof("step done in %f seconds", time.Since(start).Seconds())
} else {
l.Infof("step failed with error: %s", c.Error)
}
@@ -183,20 +177,20 @@ func (b *defaultBuilder) submit(request Request) {
r.Status = StatusCompleted
r.Image = c.Image
- r.ProcessCompletedAt = time.Now()
r.Error = c.Error
+ r.Task.CompletedAt = time.Now()
if r.Error != nil {
r.Status = StatusError
}
- r.Classpath = make([]string, 0, len(c.Libraries))
- for _, l := range c.Libraries {
+ r.Classpath = make([]string, 0, len(c.Artifacts))
+ for _, l := range c.Artifacts {
r.Classpath = append(r.Classpath, l.ID)
}
// update the cache
b.request.Store(request.Identifier, r)
- b.log.Infof("request %s:%s executed in %f seconds", r.Request.Identifier.Name, r.Request.Identifier.Qualifier, r.ProcessCompletedAt.Sub(r.ProcessStartedAt).Seconds())
+ b.log.Infof("request %s:%s executed in %f seconds", r.Request.Identifier.Name, r.Request.Identifier.Qualifier, r.Task.Elapsed().Seconds())
}
diff --git a/pkg/builder/builder_steps.go b/pkg/builder/builder_steps.go
index 98c83ee..975326e 100644
--- a/pkg/builder/builder_steps.go
+++ b/pkg/builder/builder_steps.go
@@ -30,7 +30,7 @@ import (
"github.com/apache/camel-k/pkg/util/tar"
- yaml "gopkg.in/yaml.v2"
+ "gopkg.in/yaml.v2"
"github.com/pkg/errors"
@@ -132,7 +132,7 @@ func ComputeDependencies(ctx *Context) error {
}
for _, e := range cp["dependencies"] {
- ctx.Libraries = append(ctx.Libraries, v1alpha1.Artifact{
+ ctx.Artifacts = append(ctx.Artifacts, v1alpha1.Artifact{
ID: e.ID,
Location: e.Location,
})
@@ -177,7 +177,7 @@ func IncrementalPackager(ctx *Context) error {
}
func packager(ctx *Context, selector ArtifactsSelector) error {
- imageName, selectedArtifacts, err := selector(ctx.Libraries)
+ imageName, selectedArtifacts, err := selector(ctx.Artifacts)
if err != nil {
return err
}
@@ -211,7 +211,7 @@ func packager(ctx *Context, selector ArtifactsSelector) error {
}
cp := ""
- for _, entry := range ctx.Libraries {
+ for _, entry := range ctx.Artifacts {
gav, err := maven.ParseGAV(entry.ID)
if err != nil {
return nil
diff --git a/pkg/builder/builder_types.go b/pkg/builder/builder_types.go
index 7476b00..f4cd9b8 100644
--- a/pkg/builder/builder_types.go
+++ b/pkg/builder/builder_types.go
@@ -87,29 +87,37 @@ type Request struct {
Steps []Step
}
+// Task --
+type Task struct {
+ StartedAt time.Time
+ CompletedAt time.Time
+}
+
+// Elapsed --
+func (t Task) Elapsed() time.Duration {
+ return t.CompletedAt.Sub(t.StartedAt)
+}
+
// Result represents the result of a build
type Result struct {
- Request Request
- Status Status
- Image string
- Error error
- Classpath []string
- ProcessStartedAt time.Time
- ProcessCompletedAt time.Time
+ Request Request
+ Image string
+ Error error
+ Status Status
+ Classpath []string
+ Task Task
}
// Context --
type Context struct {
C context.Context
- Namespace string
- Values map[string]interface{}
Request Request
- Project maven.Project
- Path string
- Libraries []v1alpha1.Artifact
Image string
Error error
- StepsDone []string
+ Namespace string
+ Project maven.Project
+ Path string
+ Artifacts []v1alpha1.Artifact
Archive string
}