Merge pull request #75 from GwonsooLee/hotfix_20200806

fix directory structure and base manifest file

Author: GwonsooLee

configs/hello.yaml

@@ -2,7 +2,7 @@
 name: hello
 userdata:
   type: local
-  path: examples/scripts/userdata.sh
+  path: scripts/userdata.sh
 
 autoscaling: &autoscaling_policy
   - name: scale_in

docs/content/en/schemas/metric.json

@@ -8,57 +8,36 @@
   "definitions": {
     "MetricConfig": {
       "properties": {
-        "metrics": {
-          "$ref": "#/definitions/Metrics",
-          "description": "Configuration of metrics",
-          "x-intellij-html-description": "Configuration of metrics"
-        },
         "region": {
           "type": "string",
           "description": "Base region for gathering metrics",
           "x-intellij-html-description": "Base region for gathering metrics"
         },
         "storage": {
           "$ref": "#/definitions/Storage",
-          "description": "configuration for storing metric data",
-          "x-intellij-html-description": "configuration for storing metric data"
+          "description": "Configuration for storage",
+          "x-intellij-html-description": "Configuration for storage"
         }
       },
       "additionalProperties": false,
       "preferredOrder": [
         "region",
-        "storage",
-        "metrics"
+        "storage"
       ],
       "description": "Metric Builder Configurations",
       "x-intellij-html-description": "Metric Builder Configurations"
     },
-    "Metrics": {
-      "properties": {
-        "base_timezone": {
-          "type": "string",
-          "description": "Timezone of metrics",
-          "x-intellij-html-description": "Timezone of metrics"
-        }
-      },
-      "additionalProperties": false,
-      "preferredOrder": [
-        "base_timezone"
-      ],
-      "description": "Configurations of metrics",
-      "x-intellij-html-description": "Configurations of metrics"
-    },
     "Storage": {
       "properties": {
         "name": {
           "type": "string",
-          "description": "of storage",
-          "x-intellij-html-description": "of storage"
+          "description": "Storage Name",
+          "x-intellij-html-description": "Storage Name"
         },
         "type": {
           "type": "string",
-          "description": "of storage",
-          "x-intellij-html-description": "of storage"
+          "description": "Storage Type - dynamodb",
+          "x-intellij-html-description": "Storage Type - dynamodb"
         }
       },
       "additionalProperties": false,

docs/layouts/shortcodes/schema.html

@@ -12,7 +12,7 @@
 
 {{ $schema := (readFile $json_schema) | unmarshal }}
 {{ if not $schema}}
-    {{ errorf "missing json schema: %s" .Position }}
+    {{ errorf "missing json schemas: %s" .Position }}
 {{ end }}
 
 {{ $definition := index $schema.definitions $root }}

docs/static/swagger/swagger-ui-bundle.js

@@ -72,7 +72,7 @@ func main() {
 
 func generateSchemas(root string, dryRun bool, inputFile, outputFile string) (bool, error) {
 
-	input := filepath.Join(root, "pkg", "builder", inputFile+".go")
+	input := filepath.Join(root, "pkg", "schemas", inputFile+".go")
 	output := filepath.Join(root, "docs", "content", "en", "schemas", outputFile+".json")
 
 	generator := Generator{}

docs/static/swagger/swagger-ui-standalone-preset.js

@@ -2,7 +2,7 @@ package aws
 
 import (
 	"fmt"
-	"github.com/DevopsArtFactory/goployer/pkg/builder"
+	"github.com/DevopsArtFactory/goployer/pkg/schemas"
 	"github.com/DevopsArtFactory/goployer/pkg/tool"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -32,7 +32,7 @@ func getCloudwatchClientFn(session *session.Session, region string, creds *crede
 }
 
 //CreateScalingAlarms creates scaling alarms
-func (c CloudWatchClient) CreateScalingAlarms(asg_name string, alarms []builder.AlarmConfigs, policyArns map[string]string) error {
+func (c CloudWatchClient) CreateScalingAlarms(asg_name string, alarms []schemas.AlarmConfigs, policyArns map[string]string) error {
 	if len(alarms) == 0 {
 		return nil
 	}
@@ -53,7 +53,7 @@ func (c CloudWatchClient) CreateScalingAlarms(asg_name string, alarms []builder.
 }
 
 // Create cloudwatch alarms for autoscaling group
-func (c CloudWatchClient) CreateCloudWatchAlarm(asg_name string, alarm builder.AlarmConfigs) error {
+func (c CloudWatchClient) CreateCloudWatchAlarm(asg_name string, alarm schemas.AlarmConfigs) error {
 	input := &cloudwatch.PutMetricAlarmInput{
 		AlarmName:          aws.String(alarm.Name),
 		AlarmActions:       MakeStringArrayToAwsStrings(alarm.AlarmActions),

docs/static/swagger/swagger-ui.js

@@ -2,7 +2,7 @@ package aws
 
 import (
 	"fmt"
-	"github.com/DevopsArtFactory/goployer/pkg/builder"
+	"github.com/DevopsArtFactory/goployer/pkg/schemas"
 	"github.com/DevopsArtFactory/goployer/pkg/tool"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -304,7 +304,7 @@ func (e EC2Client) CreateNewLaunchConfiguration(name, ami, instanceType, keyName
 }
 
 // Create New Launch Template
-func (e EC2Client) CreateNewLaunchTemplate(name, ami, instanceType, keyName, iamProfileName, userdata string, ebsOptimized, mixedInstancePolicyEnabled bool, securityGroups []*string, blockDevices []*ec2.LaunchTemplateBlockDeviceMappingRequest, instanceMarketOptions *builder.InstanceMarketOptions) bool {
+func (e EC2Client) CreateNewLaunchTemplate(name, ami, instanceType, keyName, iamProfileName, userdata string, ebsOptimized, mixedInstancePolicyEnabled bool, securityGroups []*string, blockDevices []*ec2.LaunchTemplateBlockDeviceMappingRequest, instanceMarketOptions *schemas.InstanceMarketOptions) bool {
 	input := &ec2.CreateLaunchTemplateInput{
 		LaunchTemplateData: &ec2.RequestLaunchTemplateData{
 			ImageId:      aws.String(ami),
@@ -423,7 +423,7 @@ func (e EC2Client) GetSecurityGroupList(vpc string, sgList []string) []*string {
 }
 
 // MakeBlockDevices returns list of block device mapping for launch configuration
-func (e EC2Client) MakeBlockDevices(blocks []builder.BlockDevice) []*autoscaling.BlockDeviceMapping {
+func (e EC2Client) MakeBlockDevices(blocks []schemas.BlockDevice) []*autoscaling.BlockDeviceMapping {
 	ret := []*autoscaling.BlockDeviceMapping{}
 
 	for _, block := range blocks {
@@ -454,7 +454,7 @@ func (e EC2Client) MakeBlockDevices(blocks []builder.BlockDevice) []*autoscaling
 }
 
 //MakeLaunchTemplateBlockDeviceMappings returns list of block device mappings for launch template
-func (e EC2Client) MakeLaunchTemplateBlockDeviceMappings(blocks []builder.BlockDevice) []*ec2.LaunchTemplateBlockDeviceMappingRequest {
+func (e EC2Client) MakeLaunchTemplateBlockDeviceMappings(blocks []schemas.BlockDevice) []*ec2.LaunchTemplateBlockDeviceMappingRequest {
 	ret := []*ec2.LaunchTemplateBlockDeviceMappingRequest{}
 
 	for _, block := range blocks {
@@ -536,11 +536,11 @@ func (e EC2Client) GetVPCId(vpc string) string {
 
 func (e EC2Client) CreateAutoScalingGroup(name, launch_template_name, healthcheck_type string,
 	healthcheck_grace_period int64,
-	capacity builder.Capacity,
+	capacity schemas.Capacity,
 	loadbalancers, target_group_arns, termination_policies, availability_zones []*string,
 	tags []*(autoscaling.Tag),
 	subnets []string,
-	mixedInstancePolicy builder.MixedInstancesPolicy,
+	mixedInstancePolicy schemas.MixedInstancesPolicy,
 	hooks []*autoscaling.LifecycleHookSpecification) (bool, error) {
 
 	lt := autoscaling.LaunchTemplateSpecification{
@@ -813,7 +813,7 @@ func (e EC2Client) UpdateAutoScalingGroup(asg string, min, max, desired, retry i
 }
 
 //CreateScalingPolicy creates scaling policy
-func (e EC2Client) CreateScalingPolicy(policy builder.ScalePolicy, asg_name string) (*string, error) {
+func (e EC2Client) CreateScalingPolicy(policy schemas.ScalePolicy, asg_name string) (*string, error) {
 	input := &autoscaling.PutScalingPolicyInput{
 		AdjustmentType:       aws.String(policy.AdjustmentType),
 		AutoScalingGroupName: aws.String(asg_name),
@@ -876,7 +876,7 @@ func (e EC2Client) EnableMetrics(asg_name string) error {
 }
 
 // Generate Lifecycle Hooks
-func (e EC2Client) GenerateLifecycleHooks(hooks builder.LifecycleHooks) []*autoscaling.LifecycleHookSpecification {
+func (e EC2Client) GenerateLifecycleHooks(hooks schemas.LifecycleHooks) []*autoscaling.LifecycleHookSpecification {
 	ret := []*autoscaling.LifecycleHookSpecification{}
 
 	if len(hooks.LaunchTransition) > 0 {
@@ -896,7 +896,7 @@ func (e EC2Client) GenerateLifecycleHooks(hooks builder.LifecycleHooks) []*autos
 	return ret
 }
 
-func createSingleLifecycleHookSpecification(l builder.LifecycleHookSpecification, transition string) autoscaling.LifecycleHookSpecification {
+func createSingleLifecycleHookSpecification(l schemas.LifecycleHookSpecification, transition string) autoscaling.LifecycleHookSpecification {
 	lhs := autoscaling.LifecycleHookSpecification{
 		LifecycleHookName:   aws.String(l.LifecycleHookName),
 		LifecycleTransition: aws.String(transition),

hack/schemas/main.go

@@ -3,6 +3,7 @@ package builder
 import (
 	"encoding/base64"
 	"fmt"
+	"github.com/DevopsArtFactory/goployer/pkg/schemas"
 	"github.com/spf13/viper"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
@@ -14,6 +15,44 @@ import (
 	Logger "github.com/sirupsen/logrus"
 )
 
+type Builder struct { // Do not add comments for this struct
+	// Config from command
+	Config Config
+
+	// AWS related Configuration
+	AwsConfig schemas.AWSConfig
+
+	// Configuration for metrics
+	MetricConfig schemas.MetricConfig
+
+	// Stack configuration
+	Stacks []schemas.Stack
+}
+
+type Config struct { // Do not add comments for this struct
+	Manifest              string        `json:"manifest"`
+	ManifestS3Region      string        `json:"manifest_s3_region"`
+	Ami                   string        `json:"ami"`
+	Env                   string        `json:"env"`
+	Stack                 string        `json:"stack"`
+	AssumeRole            string        `json:"assume_role"`
+	Timeout               time.Duration `json:"timeout"`
+	Region                string        `json:"region"`
+	SlackOff              bool          `json:"slack_off"`
+	LogLevel              string        `json:"log_level"`
+	ExtraTags             string        `json:"extra_tags"`
+	AnsibleExtraVars      string        `json:"ansible_extra_vars"`
+	OverrideInstanceType  string        `json:"override_instance_type"`
+	DisableMetrics        bool          `json:"disable_metrics"`
+	ReleaseNotes          string        `json:"release_notes"`
+	ReleaseNotesBase64    string        `json:"release_notes_base64"`
+	ForceManifestCapacity bool          `json:"force_manifest_capacity"`
+	PollingInterval       time.Duration `json:"polling_interval"`
+	AutoApply             bool          `json:"auto-apply"`
+	Application           string        `,inline`
+	StartTimestamp        int64         `,inline`
+}
+
 var (
 	NO_MANIFEST_EXISTS               = "Manifest file does not exist"
 	DEFAULT_SPOT_ALLOCATION_STRATEGY = "lowest-price"
@@ -88,15 +127,15 @@ func (b Builder) SetManifestConfigWithS3(fileBytes []byte) Builder {
 }
 
 // SetStacks set stack information
-func (b Builder) SetStacks(stacks []Stack) Builder {
+func (b Builder) SetStacks(stacks []schemas.Stack) Builder {
 
 	if len(b.Config.AssumeRole) > 0 {
 		for i, _ := range stacks {
 			stacks[i].AssumeRole = b.Config.AssumeRole
 		}
 	}
 
-	var deployStack Stack
+	var deployStack schemas.Stack
 	for _, stack := range stacks {
 		if b.Config.Stack == stack.Stack {
 			deployStack = stack
@@ -309,6 +348,11 @@ func (b Builder) CheckValidation() error {
 			if region.HealthcheckLB != "" && region.HealthcheckTargetGroup != "" {
 				return fmt.Errorf("you cannot use healthcheck_target_group and healthcheck_load_balancer at the same time")
 			}
+
+			// Check userdata
+			if stack.Userdata.Type == "local" && len(stack.Userdata.Path) > 0 && !tool.FileExists(stack.Userdata.Path) {
+				return fmt.Errorf("script file does not exists")
+			}
 		}
 
 		if stack.MixedInstancesPolicy.Enabled {
@@ -339,9 +383,9 @@ Target Stack Deployment Information
 name             	: %s
 env              	: %s
 timeout          	: %.0f min
-polling-interval 	: %.0f sec 
+polling-interval 	: %.0f sec
 assume role      	: %s
-ansible-extra-vars  : %s
+ansible-extra-vars  	: %s
 extra tags       	: %s
 ============================================================
 Stack
@@ -357,12 +401,12 @@ Stack
 	return strings.Join(summary, "\n")
 }
 
-func printEnvironment(stack Stack) string {
+func printEnvironment(stack schemas.Stack) string {
 	formatting := `[ %s ]
 Account             	: %s
 Environment             : %s
 IAM Instance Profile    : %s
-tags              : %s 
+tags              	: %s 
 Capacity                : %+v
 MixedInstancesPolicy
 - Enabled 			: %t
@@ -391,28 +435,28 @@ MixedInstancesPolicy
 }
 
 // Parsing Manifest File
-func ParsingManifestFile(manifest string) (AWSConfig, []Stack) {
+func ParsingManifestFile(manifest string) (schemas.AWSConfig, []schemas.Stack) {
 	var yamlFile []byte
 	var err error
 
 	yamlFile, err = ioutil.ReadFile(manifest)
 	if err != nil {
 		Logger.Errorf("Error reading YAML file: %s\n", err)
-		return AWSConfig{}, nil
+		return schemas.AWSConfig{}, nil
 	}
 
 	return buildStructFromYaml(yamlFile)
 }
 
-func buildStructFromYaml(yamlFile []byte) (AWSConfig, []Stack) {
+func buildStructFromYaml(yamlFile []byte) (schemas.AWSConfig, []schemas.Stack) {
 
-	yamlConfig := YamlConfig{}
+	yamlConfig := schemas.YamlConfig{}
 	err := yaml.Unmarshal(yamlFile, &yamlConfig)
 	if err != nil {
 		tool.FatalError(err)
 	}
 
-	awsConfig := AWSConfig{
+	awsConfig := schemas.AWSConfig{
 		Name:     yamlConfig.Name,
 		Userdata: yamlConfig.Userdata,
 		Tags:     yamlConfig.Tags,
@@ -455,7 +499,7 @@ func argumentParsing() Config {
 }
 
 // Set Userdata provider
-func SetUserdataProvider(userdata Userdata, default_userdata Userdata) UserdataProvider {
+func SetUserdataProvider(userdata schemas.Userdata, default_userdata schemas.Userdata) UserdataProvider {
 	//Set default if no userdata exists in the stack
 	if userdata.Type == "" {
 		userdata.Type = default_userdata.Type