1035898 - Bare Metal Provisioning 2008 Puppet: Correct Gapi manifest

Status: RESOLVED FIXED

(Infrastructure & Operations :: RelOps: Puppet, task)

Description

[Mark Cornmesser [:markco] OOO 2024/04/15]

> ::: modules/slave_secrets/manifests/google_api_key.pp
> @@ +12,2 @@
> >                  content => secret("google_api_key"),
> > +            }
> 
> This bit should be within the conditional for ensure == present and
> install_google_api_key.
> 
> ::: modules/ssh/manifests/winfiles.pp
> @@ +1,4 @@

Windows is now included within the conditional:

class slave_secrets::google_api_key($ensure=present) {
    include config
    include dirs::builds

        if ($ensure == 'present' and $config::install_google_api_key) {
            case $::operatingsystem {
                windows: {
                    file {
                        'C:/builds/gapi.data':
                            ensure => file,
                            content => secret("google_api_key"),
                    }
                }
                default: {
                    file {
                        "/builds/gapi.data":
                        content => secret("google_api_key"),
                        mode    => 0644,
                        show_diff => false;
                    }
                }
        }
        } else {
             case $::operatingsystem {
                windows: {
                    file {
                      'C:/builds/gapi.data':
                            ensure => absent;
                    }
                }
                default: {
                    file {
                        "/builds/gapi.data":
                            ensure => absent;
                }
            }
        }
    }
}

Comment 1

[Dustin J. Mitchell [:dustin] (he/him)]

Looks good.  You could shrink that a little with

  $gapi_file = $::operatingsystem? {
      windows => 'c:/builds/gapi.data',
      default => '/builds/gapi.data'
  }

..

                    file {
                        $gapi_file:
                            ensure => file,
                            content => secret("google_api_key"),
                    }

with no need for both conditionals.

Comment 2

[Mark Cornmesser [:markco] OOO 2024/04/15]

Attachment: bug1035898.patch

Comment 3

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8475225 [details] [diff] [review]
bug1035898.patch

No need for the extra license header, but otherwise looks good.