Skip to content
This repository has been archived by the owner on Jul 8, 2023. It is now read-only.

Licensing - Integrates Software Entitlement #13

Merged
merged 15 commits into from
Mar 27, 2023

Conversation

Vasu1105
Copy link
Contributor

@Vasu1105 Vasu1105 commented Mar 13, 2023

Adds a check that the provided license entitles the user to actually use the InSpec software.

The check is conditional on the distribution name, with the intent of exempting other open-source distributions from this check.

The check is currently located in the InSpec::Runner.run() call.

Description

Related Issue

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New content (non-breaking change)
  • Breaking change (a content change which would break existing functionality or processes)

Checklist:

  • I have read the CONTRIBUTING document.

@Vasu1105 Vasu1105 requested a review from a team as a code owner March 13, 2023 09:09
@Vasu1105 Vasu1105 requested review from Nik08 and ahasunos March 13, 2023 09:09
@Vasu1105 Vasu1105 changed the title Vasundhara/inspec software entitlement Adds Software entitlement Check Mar 13, 2023
@Vasu1105 Vasu1105 changed the title Adds Software entitlement Check Integrates Software entitlement Mar 13, 2023
@Vasu1105 Vasu1105 force-pushed the vasundhara/inspec-software-entitlement branch 3 times, most recently from cca7bdf to 5c1d62d Compare March 24, 2023 04:16
@clintoncwolfe clintoncwolfe added the Expeditor: Bump Minor Version Triggers a minor version bump on a PR merge. label Mar 24, 2023
Vasu1105 and others added 9 commits March 24, 2023 12:22
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Nikita Mathur <nikita.mathur@chef.io>
Signed-off-by: Nikita Mathur <nikita.mathur@chef.io>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
@Vasu1105 Vasu1105 force-pushed the vasundhara/inspec-software-entitlement branch from 0783eec to 4dd9f5b Compare March 24, 2023 06:53
@clintoncwolfe clintoncwolfe changed the title Integrates Software entitlement Licensing - Integrates Software Entitlement Mar 24, 2023
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
@Vasu1105 Vasu1105 force-pushed the vasundhara/inspec-software-entitlement branch from 87dd45e to ee46f42 Compare March 24, 2023 11:57
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
@Vasu1105 Vasu1105 force-pushed the vasundhara/inspec-software-entitlement branch from ee46f42 to d5e837c Compare March 24, 2023 12:00
clintoncwolfe and others added 3 commits March 27, 2023 01:27
…tional

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
…l runner explicitly.

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
@clintoncwolfe clintoncwolfe merged commit 699d739 into inspec-6 Mar 27, 2023
@clintoncwolfe clintoncwolfe deleted the vasundhara/inspec-software-entitlement branch March 27, 2023 14:26
sathish-progress pushed a commit that referenced this pull request May 17, 2023
* CFINSPEC-24:Integrate License Software Entitlment.

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* CFINSPEC-506 license execution check

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Software entitlement call changes and handling of error

Signed-off-by: Nikita Mathur <nikita.mathur@chef.io>

* Error handling from chef licensing error to standard error

Signed-off-by: Nikita Mathur <nikita.mathur@chef.io>

* Updated Gemfile to pick the chef licensing changes from git url

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Trying with https url

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Revert "Trying with https url"

This reverts commit 33f1f4c.

* Adds the license not entitled exit code

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Updates the require statement

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Fix typo

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Set the licensing configure for entitlement id failure

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* Use ChefLicensing::Error instead of standard error

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

* REFACTOR Move out licensing cong=fig to its own file and make unconditional

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

* FIX TESTS - Add reference to licensing config for places where we call runner explicitly.

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

* Update inputs_test to use license configuration from utils

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>

---------

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
Signed-off-by: Nikita Mathur <nikita.mathur@chef.io>
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
Co-authored-by: Nikita Mathur <nikita.mathur@chef.io>
Co-authored-by: Clinton Wolfe <clintoncwolfe@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Expeditor: Bump Minor Version Triggers a minor version bump on a PR merge.
Projects
None yet
4 participants