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

Trust new APT and RPM keys #667

Merged
merged 9 commits into from
Nov 6, 2020
Merged

Trust new APT and RPM keys #667

merged 9 commits into from
Nov 6, 2020

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Oct 30, 2020

What does this PR do?

  • Trust new APT and RPM keys
  • Amend spec tests

Describe your test plan

  • Manual tests and also run CI test suite locally with bundle exec rake test

Manual tests

Apply the module with the manifests below, it should install the Agent if using this branch's module and fail if using master.
Apply a module with no options, it should install correctly.

Ubuntu
class { 'datadog_agent':
    api_key => "notnullapikey",
    agent_repo_uri => '<test repo goes here>',
    apt_release => 'nightly',
    agent_version => '7.23.0~devel.git.35.4b4d662',
}
Redhat
class { 'datadog_agent':
    api_key => "notnullapikey",
    agent_repo_uri => '<test repo goes here>/nightly/7/x86_64/',
    agent_version => '7.23.0~devel.git.37.5884362',
}

@mx-psi mx-psi marked this pull request as ready for review November 2, 2020 10:00
@mx-psi mx-psi requested a review from a team as a code owner November 2, 2020 10:00
manifests/redhat.pp Outdated Show resolved Hide resolved
manifests/redhat.pp Outdated Show resolved Hide resolved
The removed section was irrelevant since if keys are not available
RPM will automatically import them.
@mx-psi
Copy link
Member Author

mx-psi commented Nov 3, 2020

Mind taking a second look @KSerrania?

@mx-psi mx-psi merged commit 08c40a2 into master Nov 6, 2020
@mx-psi mx-psi deleted the mx-psi/trust-new-keys branch November 6, 2020 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants