feat(os): improve macos & linux support #26

noelmcloughlin · 2019-08-17T19:37:10Z

This PR has some improvements and fixes

Set and use rootuser and rootgroup per template formula (macos/bsd)
Clarify GOPATH because its important - README special note
Improve linux alternatives yaml handling and SLS updates
Fix some issues with file/default/golang.sh.jinja

myii · 2019-08-17T20:08:34Z

@noelmcloughlin After the recent batch of yamllint PRs (see saltstack-formulas/template-formula#159 as a starting point), the template-formula provides this functionality at the end of map.jinja instead. That's why the lint stage (will be) failing here.

noelmcloughlin · 2019-08-18T00:55:34Z

Thanks @myii I fixed things up and verified on Ubuntu 18.04

          ID: golang-package-archive-install-file-directory
    Function: file.directory
        Name: /usr/local/go1.10.1.linux-amd64
      Result: True
     Comment: Directory /usr/local/go1.10.1.linux-amd64 updated
     Started: 17:50:43.812630
    Duration: 4258.498 ms
     Changes:   
              ----------
              mode:
                  0755
----------
          ID: golang-package-archive-install-file-directory
    Function: file.directory
        Name: /usr/local/golang/packages
      Result: True
     Comment: The directory /usr/local/golang/packages is in the correct state
     Started: 17:50:48.071336
    Duration: 0.89 ms
     Changes:   
----------
          ID: golang-package-archive-install-archive-extracted
    Function: archive.extracted
        Name: /usr/local/go1.10.1.linux-amd64
      Result: True
     Comment: All files in archive are already present
     Started: 17:50:48.072617
    Duration: 4367.464 ms
     Changes:   
----------
          ID: golang-package-archive-install-home-alternative-install
    Function: alternatives.install
        Name: golang-home
      Result: True
     Comment: Alternative /usr/local/go1.10.1.linux-amd64/go for golang-home is already registered
     Started: 17:50:52.440274
    Duration: 7.784 ms
     Changes:   
----------
          ID: golang-package-archive-install-godoc-alternative-install
    Function: alternatives.install
        Name: link-godoc
      Result: True
     Comment: Alternative /usr/local/go1.10.1.linux-amd64/go/bin/godoc for link-godoc is already registered
     Started: 17:50:52.448597
    Duration: 7.766 ms
     Changes:   
----------
          ID: golang-package-archive-install-gofmt-alternative-install
    Function: alternatives.install
        Name: link-gofmt
      Result: True
     Comment: Alternative /usr/local/go1.10.1.linux-amd64/go/bin/gofmt for link-gofmt is already registered
     Started: 17:50:52.456634
    Duration: 7.748 ms
     Changes:   
----------
          ID: golang-package-archive-install-go-alternative-install
    Function: alternatives.install
        Name: link-go
      Result: True
     Comment: Alternative /usr/local/go1.10.1.linux-amd64/go/bin/go for link-go is already registered
     Started: 17:50:52.464646
    Duration: 7.79 ms
     Changes:   
----------
          ID: golang-config-file-managed-environ_file
    Function: file.managed
        Name: /etc/default/golang.sh
      Result: True
     Comment: File /etc/default/golang.sh updated
     Started: 17:50:52.472695
    Duration: 32.949 ms
     Changes:   
              ----------
              diff:
                  --- 
                  +++ 
                  @@ -3,8 +3,13 @@
                   # Your changes may be overwritten.
                   ########################################################################
                   
                  -export GOROOT=/usr/local/go
                  -export GOPATH=/usr/local/golang/packages
                  -export GOBASE=/usr/local/go1.10.1.linux-amd64/go
                  -export PATH=$PATH:$GOROOT/bin:$GOBASE/bin
                  -export PATH=${PATH}:/usr/local/go1.10.1.linux-amd64
                  +##portable shell syntax
                  +
                  +[ -n "${GOROOT}" ] && export GOROOT=${GOROOT}
                  +[ -n "/usr/local/go1.10.1.linux-amd64" ] && export GOROOT=/usr/local/go1.10.1.linux-amd64
                  +
                  +[ -n "${GOPATH}" ] && export GOPATH=${GOPATH}
                  +[ -n "/usr/local/golang/packages" ] && export GOPATH=/usr/local/golang/packages
                  +
                  +export PATH=$PATH:${GOROOT}/go/bin
                  +export PATH=${PATH}:/usr/local/go1.10.1.linux-amd64/go/bin
----------
          ID: golang-package-archive-install-home-alternative-install
    Function: cmd.run
        Name: update-alternatives --install /usr/local/go golang-home /usr/local/go1.10.1.linux-amd64/go 1000
      Result: True
     Comment: onlyif condition is false
     Started: 17:50:52.505840
    Duration: 0.429 ms
     Changes:   
----------
          ID: golang-package-archive-install-home-alternative-set
    Function: alternatives.set
        Name: golang-home
      Result: True
     Comment: Alternative for golang-home already set to /usr/local/go1.10.1.linux-amd64/go
     Started: 17:50:52.506404
    Duration: 4.273 ms
     Changes:   
----------
          ID: golang-package-archive-install-go-alternative-install
    Function: cmd.run
        Name: update-alternatives --install /usr/bin/go link-go /usr/local/go1.10.1.linux-amd64/go/bin/go 1000
      Result: True
     Comment: onlyif condition is false
     Started: 17:50:52.510814
    Duration: 0.431 ms
     Changes:   
----------
          ID: golang-package-archive-install-go-alternative-set
    Function: alternatives.set
        Name: link-go
      Result: True
     Comment: Alternative for link-go already set to /usr/local/go1.10.1.linux-amd64/go/bin/go
     Started: 17:50:52.511593
    Duration: 4.075 ms
     Changes:   
----------
          ID: golang-package-archive-install-godoc-alternative-install
    Function: cmd.run
        Name: update-alternatives --install /usr/bin/godoc link-godoc /usr/local/go1.10.1.linux-amd64/go/bin/godoc 1000
      Result: True
     Comment: onlyif condition is false
     Started: 17:50:52.515809
    Duration: 0.372 ms
     Changes:   
----------
          ID: golang-package-archive-install-godoc-alternative-set
    Function: alternatives.set
        Name: link-godoc
      Result: True
     Comment: Alternative for link-godoc already set to /usr/local/go1.10.1.linux-amd64/go/bin/godoc
     Started: 17:50:52.516469
    Duration: 4.187 ms
     Changes:   
----------
          ID: golang-package-archive-install-gofmt-alternative-install
    Function: cmd.run
        Name: update-alternatives --install /usr/bin/gofmt link-gofmt /usr/local/go1.10.1.linux-amd64/go/bin/gofmt 1000
      Result: True
     Comment: onlyif condition is false
     Started: 17:50:52.520795
    Duration: 0.368 ms
     Changes:   
----------
          ID: golang-package-archive-install-gofmt-alternative-set
    Function: alternatives.set
        Name: link-gofmt
      Result: True
     Comment: Alternative for link-gofmt already set to /usr/local/go1.10.1.linux-amd64/go/bin/gofmt
     Started: 17:50:52.521450
    Duration: 4.147 ms
     Changes:   

Summary for local
-------------
Succeeded: 16 (changed=2)
Failed:     0
-------------
Total states run:     16



vagrant@ubuntu1804:~$ go env GOPATH
/home/vagrant/go
vagrant@ubuntu1804:~$ go env GOROOT
/usr/local/go
vagrant@ubuntu1804:~$ which go
/usr/bin/go

noelmcloughlin · 2019-08-18T01:03:47Z

Fixed integration tests. BTW, this PR has no breaking changes.

noelmcloughlin · 2019-08-18T01:26:29Z

Fixed comment syntax so lint passes.

Regardless of this PR I am concerned that GOPATH is exported incorrectly in this formula.
<moved text to #28 >

Hi @jackscott , could you help.

noelmcloughlin · 2019-08-18T09:36:10Z

See https://golang.org/doc/code.html#GOPATH and https://github.com/golang/go/wiki/SettingGOPATH

noelmcloughlin · 2019-08-19T14:33:19Z

To unblock this PR I raised #28

myii · 2019-08-21T15:40:46Z

Sorry for the delay, @noelmcloughlin. There looks like quite a few changes here, so my plan is to run this through a little process I have locally, to compare before and after. Once I have the results, I'll share them with you here.

myii · 2019-08-21T15:49:17Z

@noelmcloughlin Just to add, this may take me a day or two but I'll definitely come back to this (bookmarked). Please feel free to ping me if I take too long.

myii · 2019-08-24T14:12:37Z

@noelmcloughlin I've got some results that I'll be sharing with you soon. I haven't forgotten about you!

myii · 2019-09-11T04:49:53Z

@noelmcloughlin It only took me another 18 days! Sorry about that. So here it is:

myii@984a74c

If you can look through that diff and confirm that's the exact map changes you were expecting, then we're a step closer to getting this merged. Just to be clear, I've run a yaml_dump state locally, that extracts the map during the Travis run, for each instance. I did that before and after and that gives us a diff of what has changed in the proposed PR. What do you think about having such a feature used in our formulas?

noelmcloughlin · 2019-09-11T13:30:41Z

Hi @myii I have looked through the diff and the changes are as expected.

This yaml_dump_diff feature could be useful.
It's hard to judge in this case because osfamilymap.yaml is empty for Linux OSes.

myii · 2019-09-11T16:00:11Z

Hi @myii I have looked through the diff and the changes are as expected.

@noelmcloughlin Great. I'd be more comfortable with a second set of eyes to look through the changes. Any suggestions on who to ping?

noelmcloughlin · 2019-09-11T16:03:34Z

@jackscott I guess.

noelmcloughlin · 2019-11-18T14:17:57Z

@myii can we merge this - no second pair of eyes is available ;-)

myii · 2019-12-03T23:40:30Z

@noelmcloughlin Just a brief point. We don't need to include these files any more since they have been centralised into the https://github.com/saltstack-formulas/.github repo:

.github/ISSUE_TEMPLATE/bug_report.md
.github/ISSUE_TEMPLATE/feature_request.md

noelmcloughlin · 2020-01-25T21:33:47Z

selfie merging as this is open a long time without further comments.
I squashed some commits and fixed rubocop problems.
Any issues can be addressed in followup PR.

saltstack-formulas-travis · 2020-01-25T21:45:25Z

🎉 This PR is included in version 0.6.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Gemfile

noelmcloughlin mentioned this pull request Aug 17, 2019

docs(readme): special notes section saltstack-formulas/template-formula#161

Merged

noelmcloughlin force-pushed the gopath branch 2 times, most recently from 4a2851e to 873599d Compare August 17, 2019 20:03

noelmcloughlin force-pushed the gopath branch from 873599d to c85624a Compare August 18, 2019 00:34

noelmcloughlin changed the title ~~fix(config): use rootuser/rootgroup & update readme~~ feat(os): improve macos & linux support Aug 18, 2019

noelmcloughlin force-pushed the gopath branch from e211eba to d3026fc Compare August 18, 2019 00:48

noelmcloughlin force-pushed the gopath branch from 5e0dc6b to 27bf2b2 Compare August 18, 2019 01:12

noelmcloughlin requested a review from jackscott August 18, 2019 01:26

noelmcloughlin requested a review from myii August 19, 2019 23:38

noelmcloughlin force-pushed the gopath branch from d880223 to a88a793 Compare November 18, 2019 16:19

noelmcloughlin removed the request for review from jackscott January 25, 2020 18:26

noelmcloughlin added 4 commits January 25, 2020 19:46

chore(gems): update versions

952e2ad

docs(readme): clarify gopath and goroot

22c320e

test(env): update paths

6915789

feat(alternatives,macos): better msupport

6d3286d

noelmcloughlin force-pushed the gopath branch 3 times, most recently from 145c1a1 to 8313afb Compare January 25, 2020 21:01

test(rubo): fix some lint errors

a0c49f3

noelmcloughlin force-pushed the gopath branch from 8313afb to a0c49f3 Compare January 25, 2020 21:18

noelmcloughlin merged commit fecf92a into saltstack-formulas:master Jan 25, 2020

noelmcloughlin deleted the gopath branch January 25, 2020 21:33

saltstack-formulas-travis added the released label Jan 25, 2020

myii reviewed Jan 26, 2020

View reviewed changes

Gemfile Show resolved Hide resolved

noelmcloughlin mentioned this pull request Jan 26, 2020

fix(gemfile): restore content inadvertently removed #34

Merged

19 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(os): improve macos & linux support #26

feat(os): improve macos & linux support #26

noelmcloughlin commented Aug 17, 2019 •

edited

Loading

myii commented Aug 17, 2019 •

edited

Loading

noelmcloughlin commented Aug 18, 2019

noelmcloughlin commented Aug 18, 2019

noelmcloughlin commented Aug 18, 2019 •

edited

Loading

noelmcloughlin commented Aug 18, 2019 •

edited

Loading

noelmcloughlin commented Aug 19, 2019

myii commented Aug 21, 2019

myii commented Aug 21, 2019

myii commented Aug 24, 2019

myii commented Sep 11, 2019

noelmcloughlin commented Sep 11, 2019

myii commented Sep 11, 2019

noelmcloughlin commented Sep 11, 2019

noelmcloughlin commented Nov 18, 2019

myii commented Dec 3, 2019

noelmcloughlin commented Jan 25, 2020

saltstack-formulas-travis commented Jan 25, 2020

feat(os): improve macos & linux support #26

feat(os): improve macos & linux support #26

Conversation

noelmcloughlin commented Aug 17, 2019 • edited Loading

myii commented Aug 17, 2019 • edited Loading

noelmcloughlin commented Aug 18, 2019

noelmcloughlin commented Aug 18, 2019

noelmcloughlin commented Aug 18, 2019 • edited Loading

noelmcloughlin commented Aug 18, 2019 • edited Loading

noelmcloughlin commented Aug 19, 2019

myii commented Aug 21, 2019

myii commented Aug 21, 2019

myii commented Aug 24, 2019

myii commented Sep 11, 2019

noelmcloughlin commented Sep 11, 2019

myii commented Sep 11, 2019

noelmcloughlin commented Sep 11, 2019

noelmcloughlin commented Nov 18, 2019

myii commented Dec 3, 2019

noelmcloughlin commented Jan 25, 2020

saltstack-formulas-travis commented Jan 25, 2020

noelmcloughlin commented Aug 17, 2019 •

edited

Loading

myii commented Aug 17, 2019 •

edited

Loading

noelmcloughlin commented Aug 18, 2019 •

edited

Loading

noelmcloughlin commented Aug 18, 2019 •

edited

Loading