Skip to content
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.

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

Add ShibCompatValidUser option to vhost config #1657

Merged
merged 4 commits into from Jan 11, 2018
Merged

Add ShibCompatValidUser option to vhost config #1657

merged 4 commits into from Jan 11, 2018

Conversation

mdechiaro
Copy link
Contributor

No description provided.

@david22swan
Copy link
Member

@mdechiaro Please rebase your changes and resolve the conflicts.
In addition could you add test coverage to your changes.

@mdechiaro
Copy link
Contributor Author

@david22swan I'll work on getting those tests added hopefully in the next few weeks.

@david22swan
Copy link
Member

@mdechiaro Good to hear

@david22swan
Copy link
Member

Closing and reopening PR to solve bundler issue

@david22swan david22swan closed this Jan 8, 2018
@david22swan david22swan reopened this Jan 8, 2018
@david22swan david22swan closed this Jan 8, 2018
@david22swan david22swan reopened this Jan 8, 2018
@mdechiaro
Copy link
Contributor Author

@david22swan I am having some trouble with the spec tests, and hopefully you can provide some
assistance. The shibboleth code lack examples of tests for other parameters that I can reference.

What I am trying to accomplish is test that the parameter ShibCompatValidUser can be set inside
apache::vhost when declared, but I can't get the spec tests to pass. I was able to
successfully create an acceptance test with the following code:

  # spec/acceptance/vhost_spec.rb
  describe 'shibboleth parameters' do
    it 'applies cleanly' do
      pp = <<-EOS
        class { 'apache': }
        class { 'apache::mod::shib': }
        apache::vhost { 'test.server':
          port    => '80',
          docroot => '/var/www/html',
          shib_compat_valid_user => 'On'
        }
      EOS
      apply_manifest(pp, :catch_failures => true)
    end
    describe file("#{$vhost_dir}/25-test.server.conf") do
      it { is_expected.to be_file }
      it { is_expected.to contain 'ShibCompatValidUser On' }
    end
  end

How should I set the spec test to validate this parameter?

@david22swan
Copy link
Member

@mdechiaro I'm afraid I don't understand what you mean, is the example test you posted working? And by spec test's do you mean unit, if so what you already have is enough in my opinion.

Also update the order of the concat::fragment and fix syntax errors.
@mdechiaro
Copy link
Contributor Author

@david22swan Yes, I was referring to unit testing. I committed the acceptance test, and let me know if you need anything else.

@david22swan david22swan merged commit bec82dc into puppetlabs:master Jan 11, 2018
hunner added a commit to hunner/puppetlabs-apache that referenced this pull request Jan 12, 2018
The shibb package is not in the default repos.

Broken in puppetlabs#1657
hunner added a commit to hunner/puppetlabs-apache that referenced this pull request Jan 12, 2018
The shibb package is not in the default repos; broken by puppetlabs#1657

On Dec 12th 2017 travis-ci updated their trusty environment and disabled
ipv6. This causes ipv6 tests to fail.
cegeka-jenkins pushed a commit to cegeka/puppet-apache that referenced this pull request Jul 15, 2020
Add ShibCompatValidUser option to vhost config
cegeka-jenkins pushed a commit to cegeka/puppet-apache that referenced this pull request Jul 15, 2020
The shibb package is not in the default repos; broken by puppetlabs#1657

On Dec 12th 2017 travis-ci updated their trusty environment and disabled
ipv6. This causes ipv6 tests to fail.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants