commit e3086aec0f5324822cf5e5e53b1f55e3e784da5f
author Pratik Mallya <pratik.mallya@gmail.com> Mon Sep 21 15:25:16 2015 -0500
committer Pratik Mallya <pratik.mallya@gmail.com> Tue Sep 22 13:35:13 2015 -0500
tree e2b987ca9b34afb9cb39998290b81783b328eab2
parent bfc6edab0725c96aae02e806f10217b9af87ba2a

Refactor functions into methods

GetRRFileContents and GetFileContents are better suited as
methods of Environment and Template repectively.

openstack/orchestration/v1/stacks/requests.go

diff --git a/openstack/orchestration/v1/stacks/requests.go b/openstack/orchestration/v1/stacks/requests.go
index 9859d4d..230525c 100644
--- a/openstack/orchestration/v1/stacks/requests.go
+++ b/openstack/orchestration/v1/stacks/requests.go
@@ -100,7 +100,7 @@
 			return nil, err
 		}
 
-		if err := GetFileContents(opts.TemplateOpts, opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
+		if err := opts.TemplateOpts.GetFileContents(opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
 			return nil, err
 		}
 		opts.TemplateOpts.FixFileRefs()
@@ -118,7 +118,7 @@
 		if err := opts.EnvironmentOpts.Parse(); err != nil {
 			return nil, err
 		}
-		if err := GetRRFileContents(opts.EnvironmentOpts, ignoreIfEnvironment); err != nil {
+		if err := opts.EnvironmentOpts.GetRRFileContents(ignoreIfEnvironment); err != nil {
 			return nil, err
 		}
 		opts.EnvironmentOpts.FixFileRefs()
@@ -250,7 +250,7 @@
 			return nil, err
 		}
 
-		if err := GetFileContents(opts.TemplateOpts, opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
+		if err := opts.TemplateOpts.GetFileContents(opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
 			return nil, err
 		}
 		opts.TemplateOpts.FixFileRefs()
@@ -273,7 +273,7 @@
 		if err := opts.EnvironmentOpts.Parse(); err != nil {
 			return nil, err
 		}
-		if err := GetRRFileContents(opts.EnvironmentOpts, ignoreIfEnvironment); err != nil {
+		if err := opts.EnvironmentOpts.GetRRFileContents(ignoreIfEnvironment); err != nil {
 			return nil, err
 		}
 		opts.EnvironmentOpts.FixFileRefs()
@@ -461,7 +461,7 @@
 			return nil, err
 		}
 
-		if err := GetFileContents(opts.TemplateOpts, opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
+		if err := opts.TemplateOpts.GetFileContents(opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
 			return nil, err
 		}
 		opts.TemplateOpts.FixFileRefs()
@@ -476,7 +476,7 @@
 		if err := opts.EnvironmentOpts.Parse(); err != nil {
 			return nil, err
 		}
-		if err := GetRRFileContents(opts.EnvironmentOpts, ignoreIfEnvironment); err != nil {
+		if err := opts.EnvironmentOpts.GetRRFileContents(ignoreIfEnvironment); err != nil {
 			return nil, err
 		}
 		opts.EnvironmentOpts.FixFileRefs()
@@ -607,7 +607,7 @@
 			return nil, err
 		}
 
-		if err := GetFileContents(opts.TemplateOpts, opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
+		if err := opts.TemplateOpts.GetFileContents(opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
 			return nil, err
 		}
 		opts.TemplateOpts.FixFileRefs()
@@ -625,7 +625,7 @@
 		if err := opts.EnvironmentOpts.Parse(); err != nil {
 			return nil, err
 		}
-		if err := GetRRFileContents(opts.EnvironmentOpts, ignoreIfEnvironment); err != nil {
+		if err := opts.EnvironmentOpts.GetRRFileContents(ignoreIfEnvironment); err != nil {
 			return nil, err
 		}
 		opts.EnvironmentOpts.FixFileRefs()