@@ -100,10 +100,10 @@ func getAllComposeFiles() ([]string, string, error) {
100100 return composeFilePaths , strings .Join (paths , " " ), nil
101101}
102102
103- func getDockerServiceArray (dockerComposeYml string ) ([]string , error ) {
103+ func getDockerServiceArray (dockerComposeYaml string ) ([]string , error ) {
104104 var serviceKeys []string
105105
106- data , err := os .ReadFile (dockerComposeYml )
106+ data , err := os .ReadFile (dockerComposeYaml )
107107 if err != nil {
108108 return nil , err
109109 }
@@ -126,7 +126,7 @@ func getDockerServiceArray(dockerComposeYml string) ([]string, error) {
126126 return serviceKeys , nil
127127}
128128
129- func runDockerExec (dockerComposeYml string , dockerService string ) error {
129+ func runDockerExec (dockerComposeYaml string , dockerService string ) error {
130130 dockerExecCommand := os .Getenv ("CONTAINER_EXEC_COMMAND" )
131131 if dockerExecCommand == "" {
132132 dockerExecCommand = defaultContainerExecCommand
@@ -136,7 +136,7 @@ func runDockerExec(dockerComposeYml string, dockerService string) error {
136136 for i , part := range dockerExecCommandParts {
137137 switch part {
138138 case "%COMPOSE" :
139- dockerExecCommandParts [i ] = dockerComposeYml
139+ dockerExecCommandParts [i ] = dockerComposeYaml
140140 case "%SERVICE" :
141141 dockerExecCommandParts [i ] = dockerService
142142 }
@@ -161,12 +161,12 @@ func main() {
161161 }
162162 fmt .Println (help )
163163 fmt .Println ()
164- fmt .Println ("Version: " + version )
164+ fmt .Printf ("Version: %s \n " , version )
165165 os .Exit (0 )
166166 }
167167
168168 var (
169- dockerComposeYml string
169+ dockerComposeYaml string
170170 dockerService string
171171 )
172172
@@ -177,28 +177,28 @@ func main() {
177177 os .Exit (1 )
178178 }
179179 if len (allComposeFiles ) == 0 {
180- fmt .Println ("Error: no docker compose.yml found in " , paths )
180+ fmt .Printf ("Error: no docker Docker Compose YAML found in %s \n " , paths )
181181 os .Exit (1 )
182182 }
183183
184184 form := huh .NewForm (
185185 huh .NewGroup (
186186 huh .NewSelect [string ]().
187187 Options (huh .NewOptions (allComposeFiles ... )... ).
188- Value (& dockerComposeYml ).
189- Title ("Docker Compose yml " ),
188+ Value (& dockerComposeYaml ).
189+ Title ("Docker Compose YAML " ),
190190 huh .NewSelect [string ]().
191191 Value (& dockerService ).
192192 TitleFunc (func () string {
193- return "Services in " + dockerComposeYml
194- }, & dockerComposeYml ).
193+ return "Services in " + dockerComposeYaml
194+ }, & dockerComposeYaml ).
195195 OptionsFunc (func () []huh.Option [string ] {
196- serviceKeys , err := getDockerServiceArray (dockerComposeYml )
196+ serviceKeys , err := getDockerServiceArray (dockerComposeYaml )
197197 if err != nil {
198198 serviceKeys = []string {"Error: " + err .Error ()}
199199 }
200200 return huh .NewOptions (serviceKeys ... )
201- }, & dockerComposeYml /* only this function when `dockerComposeYml ` changes */ ),
201+ }, & dockerComposeYaml /* only this function when `dockerComposeYaml ` changes */ ),
202202 ),
203203 )
204204
@@ -212,7 +212,7 @@ func main() {
212212 os .Exit (1 )
213213 }
214214
215- err = runDockerExec (dockerComposeYml , dockerService )
215+ err = runDockerExec (dockerComposeYaml , dockerService )
216216 if err != nil {
217217 fmt .Printf ("Error: %s\n " , err )
218218 os .Exit (1 )
0 commit comments