Skip to content

(MODULES-5968) Generated types / vendored code removal #3

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Nov 17, 2017
Merged

(MODULES-5968) Generated types / vendored code removal #3

merged 3 commits into from
Nov 17, 2017

Conversation

@Iristyle
Copy link
Contributor

@Iristyle Iristyle commented Nov 9, 2017 •
edited
Loading

Supersedes #1

UPDATE: This has been cleaned up / restricted to just MODULES-5968 removals for the sake of separate efforts / merges. Re-namespacing is in #4 and build task removals are in #5

Original differences from that PR (now spanning into the #4 / #5):

  • Consolidates removal of generated types, their vendored content + corresponding tests - from the perspective of tests, these should be removed concurrently
  • Updated NOTICE / .project with dsc_lite
  • Removed additional LCM content - README docs, test helpers, acceptance tests - by keeping f7b15d7 isolated, we can apply it to the DSC repo as well given they have the same history
  • Updated .fixtures.yml / acceptance test helpers to not install stdlib / powershell as module deps (were only necessary for LCM manifest)
  • Keeps rake tasks / type building helpers ... these will be necessary to keep for the time being - removal is a separate activity
  • Updated existing type generation ERB template with correct namespaces - will be necessary to compare old generation to new generation using these for the time being
  • Remove uses_win32console fact that's not used
  • Namespace invoke_dsc_resource.ps1.erb / move file to dsc_lite
  • Keeps dsc_file, dsc_service, dsc_xservice (and vendored xservice content from xPSDesiredStateConfiguration including CommonResourceHelpers.psm1) to keep tests passing (can later swap in our dsc_puppetfakeresource or similar for sake of keeping tests valid / passing) - this will need to be removed prior to shipping this module
  • Keeps provider/powershell_spec.rb running against dsc_file - stubbing in new dsc type is a separate activity that can be handled in (WIP) (MODULES-5842) Generic DSC invoker #2
  • Fixes requires inside dsc_puppetfakeresource so that tests pass
  • Removals were done under the wrong ticket MODULES-5839 / filed new ticket MODULES-5968

@Iristyle
(MODULES-5968) Remove LCM code / tests
712c455 
 - Additionally remove references to both stdlib and powershell
   modules as dependencies. The LCM config manifest wsa the only thing
   using these modules, and without it, they can be removed!
@jpogran @Iristyle
(MODULES-5968) Remove generated + vendored types
f7b15d7 
 - Remove all the generated types from lib/puppet/type/dsc_* and their
   corresponding specs from spec/unit/puppet/type/dsc_*.

 - Remove all vendored content inside of lib/puppet_x/dsc_resources/,
   except for xService in xPSDesiredStateConfiguration. xService is
   used in an acceptance test that may need to have a more generic
   equivalent built.

 - Remove most acceptance tests on basic dsc resources that won't be
   part of this module any longer from tests/acceptance/tests/,
   tests/integration/tests/ and corresponding test fixture data from
   tests/files/test_installer/ and tests/manifests/.
   More generic tests that use dsc_file were left (for now).

 - Exceptions:

   * Leave dsc_file.rb type for now to allow specs to pass.
   * Leave dsc_service.rb and dsc_xservice.rb to allow acceptance
     tests to pass.
@Iristyle
Copy link
Contributor Author

Iristyle commented Nov 9, 2017 •
edited
Loading

Ran commits through rake spec, integration and acceptance helper scripts. rake spec results omitted, but everything passed along the way.

Results of Beaker tests against puppet-agent 1.10.9 (puppet apply) and PE 2017.3.2 (puppet agent):

f7b15d7

./acceptance_tests.sh windows-2012r2-64a 1.10.9 local

      Test Suite: tests @ 2017-11-09 09:55:28 -0800

      - Host Configuration Summary -


              - Test Case Summary for suite 'tests' -
       Total Suite Time: 152.44 seconds
      Average Test Time: 19.06 seconds
              Attempted: 8
                 Passed: 8
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 8

./integration_tests.sh windows-2012r2-64mda http://pe-releases.puppetlabs.lan/2017.3.2/ local

      Test Suite: tests @ 2017-11-09 10:10:12 -0800

      - Host Configuration Summary -


              - Test Case Summary for suite 'tests' -
       Total Suite Time: 541.67 seconds
      Average Test Time: 31.86 seconds
              Attempted: 17
                 Passed: 17
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 17

faed99f

./acceptance_tests.sh windows-2012r2-64a 1.10.9 local

Test Suite: tests @ 2017-11-09 10:21:15 -0800

      - Host Configuration Summary -


              - Test Case Summary for suite 'tests' -
       Total Suite Time: 154.70 seconds
      Average Test Time: 19.34 seconds
              Attempted: 8
                 Passed: 8
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 8

      - Specific Test Case Status -

./integration_tests.sh windows-2012r2-64mda http://pe-releases.puppetlabs.lan/2017.3.2/ local

      Test Suite: tests @ 2017-11-09 11:05:29 -0800

      - Host Configuration Summary -


              - Test Case Summary for suite 'tests' -
       Total Suite Time: 540.27 seconds
      Average Test Time: 31.78 seconds
              Attempted: 17
                 Passed: 17
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 17

16e7a6d

./acceptance_tests.sh windows-2012r2-64a 1.10.9 local

Test Suite: tests @ 2017-11-09 10:26:46 -0800

      - Host Configuration Summary -


              - Test Case Summary for suite 'tests' -
       Total Suite Time: 152.29 seconds
      Average Test Time: 19.04 seconds
              Attempted: 8
                 Passed: 8
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 8

./integration_tests.sh windows-2012r2-64mda http://pe-releases.puppetlabs.lan/2017.3.2/ local

Test Suite: tests @ 2017-11-09 10:39:05 -0800

      - Host Configuration Summary -


              - Test Case Summary for suite 'tests' -
       Total Suite Time: 527.74 seconds
      Average Test Time: 31.04 seconds
              Attempted: 17
                 Passed: 17
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 17

This was referenced Nov 15, 2017
Merged
Merged
@Iristyle Iristyle changed the title (MODULES-5968)(MODULES-5844) Remove code + re-namespace to dsc_lite (MODULES-5968) Generated types / vendored code removal Nov 15, 2017
@glennsarti glennsarti merged commit 4f18a57 into puppetlabs:master Nov 17, 2017
@Iristyle Iristyle mentioned this pull request Nov 17, 2017
Merged
@Iristyle Iristyle deleted the pr/1 branch November 21, 2017 00:28
@Iristyle Iristyle mentioned this pull request Nov 21, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

maintenance

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Iristyle @glennsarti @jordanbreen28 @jpogran