Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature add source strategy #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 59 additions & 6 deletions openshift/structures_build_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ func flattenBuildConfigSource(in api.BuildSource) ([]interface{}, error) {
att["dockerfile"] = *in.Dockerfile
}

if in.Git != nil {
att["git"] = flattenBuildConfigGit(*in.Git)
}

if in.SourceSecret != nil {
att["source_secret"] = flattenLocalObjectReference(in.SourceSecret)
}

return []interface{}{att}, nil
}

Expand All @@ -168,13 +176,31 @@ func flattenBuildConfigBinary(in api.BinaryBuildSource) []interface{} {
return []interface{}{att}
}

func flattenBuildConfigGit(in api.GitBuildSource) []interface{} {
att := make(map[string]interface{})

if in.URI != "" {
att["uri"] = in.URI
}

if in.Ref != "" {
att["ref"] = in.Ref
}

return []interface{}{att}
}

func flattenBuildConfigStrategy(in api.BuildStrategy) ([]interface{}, error) {
att := make(map[string]interface{})

if in.Type != "" {
att["type"] = in.Type
}

if in.SourceStrategy != nil {
att["source_strategy"] = flattenBuildConfigSourceStrategy(*in.SourceStrategy)
}

if in.DockerStrategy != nil {
att["docker_strategy"] = flattenBuildConfigDockerStrategy(*in.DockerStrategy)
}
Expand Down Expand Up @@ -214,6 +240,18 @@ func flattenBuildConfigJenkinsPipelineStrategy(in api.JenkinsPipelineBuildStrate
return []interface{}{att}
}

func flattenBuildConfigSourceStrategy(in api.SourceBuildStrategy) []interface{} {
att := make(map[string]interface{})

att["from"] = flattenObjectReference(in.From)

if in.PullSecret != nil {
att["pull_secret"] = flattenLocalObjectReference(in.PullSecret)
}

return []interface{}{att}
}

func expandBuildConfigSpec(buildConfig []interface{}) (api.BuildConfigSpec, error) {
obj := api.BuildConfigSpec{}

Expand Down Expand Up @@ -487,9 +525,9 @@ func expandBuildConfigStrategy(l []interface{}) api.BuildStrategy {
obj.DockerStrategy = expandBuildConfigStrategyDockerBuildStrategy(v)
}

// if v, ok := in["source_strategy"].([]interface{}); ok && len(v) > 0 {
// obj.SourceStrategy = expandBuildConfigStrategySourceStrategy(v)
// }
if v, ok := in["source_strategy"].([]interface{}); ok && len(v) > 0 {
obj.SourceStrategy = expandBuildConfigStrategySourceStrategy(v)
}

if v, ok := in["jenkins_pipeline_strategy"].([]interface{}); ok && len(v) > 0 {
obj.JenkinsPipelineStrategy = expandBuildConfigStrategyJenkinsPipelineStrategy(v)
Expand Down Expand Up @@ -521,9 +559,24 @@ func expandBuildConfigStrategyDockerBuildStrategy(l []interface{}) *api.DockerBu
return obj
}

//func expandBuildConfigStrategySourceStrategy() {
//
//}
func expandBuildConfigStrategySourceStrategy(l []interface{}) *api.SourceBuildStrategy {
obj := &api.SourceBuildStrategy{}
if len(l) == 0 || l[0] == nil {
return obj
}

in := l[0].(map[string]interface{})

if v, ok := in["from"].([]interface{}); ok && len(v) > 0 {
obj.From = expandBuildConfigImageDefinition(v)
}

if v, ok := in["pull_secret"].([]interface{}); ok && len(v) > 0 {
obj.PullSecret = expandBuildConfigSecret(v)
}

return obj
}

func expandBuildConfigStrategyJenkinsPipelineStrategy(l []interface{}) *api.JenkinsPipelineBuildStrategy {
obj := &api.JenkinsPipelineBuildStrategy{}
Expand Down