Merge branch 'develop' into feature/gh-80-google-vpc

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### FEATURES
 
 * Support GCE virtual private networks (VPC) ([GH-80](https://github.com/ystia/yorc/issues/80))
+* Support Kubernetes Jobs. ([GH-86](https://github.com/ystia/yorc/issues/86))
 
 ### ENHANCEMENTS
 

data/tosca/yorc-kubernetes-types.yml

@@ -45,6 +45,15 @@ node_types:
           implementation:
             file: "embedded"
             type: yorc.artifacts.Deployment.Kubernetes
+
+  yorc.nodes.kubernetes.api.types.JobResource:
+    derived_from: org.alien4cloud.kubernetes.api.types.JobResource
+    interfaces:
+      tosca.interfaces.node.lifecycle.Runnable:
+        run:
+          implementation:
+            file: "embedded"
+            type: yorc.artifacts.Deployment.Kubernetes
 
   yorc.nodes.kubernetes.api.types.ServiceResource:
     derived_from: org.alien4cloud.kubernetes.api.types.ServiceResource

deployments/definition_store.go

@@ -875,9 +875,9 @@ func registerImplementationTypes(ctx context.Context, kv *api.KV, deploymentID s
 					return errors.Errorf("Duplicate implementation artifact file extension %q found in artifact %q and %q", ext, check, t)
 				}
 				extPath := path.Join(consulutil.DeploymentKVPrefix, deploymentID, "topology", implementationArtifactsExtensionsPath, ext)
-				_, err = kv.Put(&api.KVPair{Key: extPath, Value: []byte(t)}, nil)
+				err = consulutil.StoreConsulKeyAsString(extPath, t)
 				if err != nil {
-					return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
+					return err
 				}
 			}
 		}

deployments/instances.go

@@ -28,7 +28,7 @@ import (
 // SetInstanceStateStringWithContextualLogs stores the state of a given node instance and publishes a status change event
 // context is used to carry contextual information for logging (see events package)
 func SetInstanceStateStringWithContextualLogs(ctx context.Context, kv *api.KV, deploymentID, nodeName, instanceName, state string) error {
-	_, err := kv.Put(&api.KVPair{Key: path.Join(consulutil.DeploymentKVPrefix, deploymentID, "topology/instances", nodeName, instanceName, "attributes/state"), Value: []byte(state)}, nil)
+	err := consulutil.StoreConsulKeyAsString(path.Join(consulutil.DeploymentKVPrefix, deploymentID, "topology/instances", nodeName, instanceName, "attributes/state"), state)
 	if err != nil {
 		return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
 	}

deployments/nodes.go

@@ -368,12 +368,7 @@ func GetNodePropertyValue(kv *api.KV, deploymentID, nodeName, propertyName strin
 
 // SetNodeProperty sets a node property
 func SetNodeProperty(kv *api.KV, deploymentID, nodeName, propertyName, propertyValue string) error {
-	kvp := &api.KVPair{
-		Key:   path.Join(consulutil.DeploymentKVPrefix, deploymentID, "topology", "nodes", nodeName, "properties", propertyName),
-		Value: []byte(propertyValue),
-	}
-	_, err := kv.Put(kvp, nil)
-	return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
+	return consulutil.StoreConsulKeyAsString(path.Join(consulutil.DeploymentKVPrefix, deploymentID, "topology", "nodes", nodeName, "properties", propertyName), propertyValue)
 }
 
 // GetStringNodeProperty returns the string value of a property.

deployments/relationships.go

@@ -231,6 +231,7 @@ func addOrRemoveInstanceFromTargetRelationship(kv *api.KV, deploymentID, nodeNam
 	if err != nil {
 		return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
 	}
+	_, errGrp, store := consulutil.WithContext(context.Background())
 	for _, relInstKVPair := range relInstKVPairs {
 		if strings.HasSuffix(relInstKVPair.Key, "target/name") {
 			if string(relInstKVPair.Value) == nodeName {
@@ -239,7 +240,7 @@ func addOrRemoveInstanceFromTargetRelationship(kv *api.KV, deploymentID, nodeNam
 				if err != nil {
 					return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
 				}
-				if kvp.Value == nil {
+				if kvp == nil || len(kvp.Value) == 0 {
 					return errors.Errorf("Missing key %q", instPath)
 				}
 				instances := strings.Split(string(kvp.Value), ",")
@@ -257,16 +258,11 @@ func addOrRemoveInstanceFromTargetRelationship(kv *api.KV, deploymentID, nodeNam
 					}
 					instances = newInstances
 				}
-				kvp.Value = []byte(strings.Join(instances, ","))
-				_, err = kv.Put(kvp, nil)
-				if err != nil {
-					return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
-				}
-
+				store.StoreConsulKeyAsString(instPath, strings.Join(instances, ","))
 			}
 		}
 	}
-	return nil
+	return errGrp.Wait()
 }
 
 // DeleteRelationshipInstance deletes the instance from relationship instances stored in consul

events/events.go

@@ -151,8 +151,7 @@ func PublishAndLogWorkflowStatusChange(ctx context.Context, kv *api.KV, deployme
 func storeStatusUpdateEvent(kv *api.KV, deploymentID string, eventType StatusUpdateType, data string) (string, error) {
 	now := time.Now().Format(time.RFC3339Nano)
 	eventsPrefix := path.Join(consulutil.EventsPrefix, deploymentID)
-	p := &api.KVPair{Key: path.Join(eventsPrefix, now), Value: []byte(data), Flags: uint64(eventType)}
-	_, err := kv.Put(p, nil)
+	err := consulutil.StoreConsulKeyAsStringWithFlags(path.Join(eventsPrefix, now), data, uint64(eventType))
 	if err != nil {
 		return "", err
 	}

prov/ansible/executor.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/ystia/yorc/config"
 	"github.com/ystia/yorc/events"
-	"github.com/ystia/yorc/helper/stringutil"
 	"github.com/ystia/yorc/log"
 	"github.com/ystia/yorc/prov"
 	"github.com/ystia/yorc/tasks"
@@ -57,16 +56,6 @@ func (e *defaultExecutor) ExecOperation(ctx context.Context, conf config.Configu
 	}
 	kv := consulClient.KV()
 
-	logOptFields, ok := events.FromContext(ctx)
-	if !ok {
-		return errors.New("Missing context log fields")
-	}
-	logOptFields[events.NodeID] = nodeName
-	logOptFields[events.ExecutionID] = taskID
-	logOptFields[events.OperationName] = stringutil.GetLastElement(operation.Name, ".")
-	logOptFields[events.InterfaceName] = stringutil.GetAllExceptLastElement(operation.Name, ".")
-	ctx = events.NewContext(ctx, logOptFields)
-
 	exec, err := newExecution(ctx, kv, conf, taskID, deploymentID, nodeName, operation, e.cli)
 	if err != nil {
 		if IsOperationNotImplemented(err) {

prov/hostspool/executor.go

@@ -17,21 +17,18 @@ package hostspool
 import (
 	"context"
 	"encoding/json"
+	"strconv"
 	"strings"
 
-	"github.com/ystia/yorc/helper/labelsutil"
-
-	"github.com/hashicorp/go-multierror"
-
+	"github.com/dustin/go-humanize"
 	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 
-	"strconv"
-
-	"github.com/dustin/go-humanize"
 	"github.com/ystia/yorc/config"
 	"github.com/ystia/yorc/deployments"
 	"github.com/ystia/yorc/events"
+	"github.com/ystia/yorc/helper/labelsutil"
 	"github.com/ystia/yorc/tasks"
 	"github.com/ystia/yorc/tosca"
 )
@@ -44,16 +41,6 @@ func (e *defaultExecutor) ExecDelegate(ctx context.Context, cfg config.Configura
 	if err != nil {
 		return err
 	}
-	// Fill log optional fields for log registration
-	logOptFields, ok := events.FromContext(ctx)
-	if !ok {
-		return errors.New("Missing contextual log optional fields")
-	}
-	logOptFields[events.NodeID] = nodeName
-	logOptFields[events.ExecutionID] = taskID
-	logOptFields[events.OperationName] = delegateOperation
-	logOptFields[events.InterfaceName] = "delegate"
-	ctx = events.NewContext(ctx, logOptFields)
 
 	instances, err := tasks.GetInstances(cc.KV(), taskID, deploymentID, nodeName)
 	if err != nil {
@@ -133,9 +120,7 @@ func (e *defaultExecutor) hostsPoolCreate(originalCtx context.Context, cc *api.C
 		return err
 	}
 	for _, instance := range instances {
-		logOptFields, _ := events.FromContext(originalCtx)
-		logOptFields[events.InstanceID] = instance
-		ctx := events.NewContext(originalCtx, logOptFields)
+		ctx := events.AddLogOptionalFields(originalCtx, events.LogOptionalFields{events.InstanceID: instance})
 
 		allocation := &Allocation{NodeName: nodeName, Instance: instance, DeploymentID: deploymentID, Shareable: shareable, Resources: allocatedResources}
 		hostname, warnings, err := hpManager.Allocate(allocation, filters...)
@@ -318,9 +303,7 @@ func (e *defaultExecutor) hostsPoolDelete(originalCtx context.Context, cc *api.C
 	}
 	var errs error
 	for _, instance := range instances {
-		logOptFields, _ := events.FromContext(originalCtx)
-		logOptFields[events.InstanceID] = instance
-		ctx := events.NewContext(originalCtx, logOptFields)
+		ctx := events.AddLogOptionalFields(originalCtx, events.LogOptionalFields{events.InstanceID: instance})
 		hostname, err := deployments.GetInstanceAttributeValue(cc.KV(), deploymentID, nodeName, instance, "hostname")
 		if err != nil {
 			errs = multierror.Append(errs, err)

prov/hostspool/hostspool_mgr.go

@@ -15,6 +15,7 @@
 package hostspool
 
 import (
+	"context"
 	"fmt"
 	"path"
 	"reflect"
@@ -388,12 +389,10 @@ func (cm *consulManager) backupHostStatus(hostname string) error {
 		return err
 	}
 	hostPath := path.Join(consulutil.HostsPoolPrefix, hostname)
-	_, err = cm.cc.KV().Put(&api.KVPair{Key: path.Join(hostPath, ".statusBackup"), Value: []byte(status.String())}, nil)
-	if err != nil {
-		return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
-	}
-	_, err = cm.cc.KV().Put(&api.KVPair{Key: path.Join(hostPath, ".messageBackup"), Value: []byte(message)}, nil)
-	return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
+	_, errGrp, store := consulutil.WithContext(context.Background())
+	store.StoreConsulKeyAsString(path.Join(hostPath, ".statusBackup"), status.String())
+	store.StoreConsulKeyAsString(path.Join(hostPath, ".messageBackup"), message)
+	return errGrp.Wait()
 }
 func (cm *consulManager) restoreHostStatus(hostname string) error {
 	hostPath := path.Join(consulutil.HostsPoolPrefix, hostname)
@@ -441,9 +440,9 @@ func (cm *consulManager) setHostStatusWithMessage(hostname string, status HostSt
 	if err != nil {
 		return err
 	}
-	_, err = cm.cc.KV().Put(&api.KVPair{Key: path.Join(consulutil.HostsPoolPrefix, hostname, "status"), Value: []byte(status.String())}, nil)
+	err = consulutil.StoreConsulKeyAsString(path.Join(consulutil.HostsPoolPrefix, hostname, "status"), status.String())
 	if err != nil {
-		return errors.Wrap(err, consulutil.ConsulGenericErrMsg)
+		return err
 	}
 	return cm.setHostMessage(hostname, message)
 }