Set subscription type as developer for developer subscriptions. #14584
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tong He <[email protected]>
Signed-off-by: Tong He <[email protected]>
Signed-off-by: Tong He <[email protected]>
Signed-off-by: Tong He <[email protected]>
unnecessary-username
force-pushed
the
developer-license
branch
from
668217b
to
524668d
Compare
CFSNM
approved these changes
Nov 14, 2023
rooftopcellist
approved these changes
Nov 14, 2023
|
@unnecessary-username Congratulations on your first merged PR @rooftopcellist @CFSNM Thank you for the reviews & running this against the licensing tests. |
djyasin
added a commit
to djyasin/awx
that referenced
this pull request
Jan 4, 2024
Fixed ldap url a bit and cleaned up a few things. Changed conditional back to adn rather than or and changed var back to password rather than username. fix wsrelay connection in ipv6 environments Fix: ansible#14511 Add alt-text codeblock to Images for Userguide: main_menu.rst Signed-off-by: Ratan Gulati <[email protected]> Revised the proposed Alt text for main_menu.rst Update insights.rst Update insights.rst Revised proposed alt text for insights.rst Updated images - Workflow Templates chapter of Userguide. Removed references to images that were deleted. Fix: ansible#14523 Add alt-text codeblock to Images for workflow_template.rst (ansible#14604) * add alt to images in workflow_templates.rst Signed-off-by: Ratan Gulati <[email protected]> * add alt to images in workflow_templates.rst Signed-off-by: Ratan Gulati <[email protected]> * Update workflow_templates.rst * Revised proposed alt text for workflow_templates.rst --------- Signed-off-by: Ratan Gulati <[email protected]> Co-authored-by: TVo <[email protected]> Added alt text for settings-menu.rst (ansible#14639) * Re-do for PR ansible#14595 to fix CI issues. * Added alt text to settings-menu.rst * Update docs/docsite/rst/common/settings-menu.rst Co-authored-by: Don Naro <[email protected]> --------- Co-authored-by: Hao Liu <[email protected]> Co-authored-by: Don Naro <[email protected]> Docs: Include REST API reference content from swagger.json (ansible#14607) Setting credential_type as required (ansible#14651) * Setting credential_type as required * Added test for missing credential_type in credential module * Corrected test assertion --------- Co-authored-by: Lucas Benedito <[email protected]> Replaced with larger graphic. (ansible#14647) Correctly handle case where unpartitioned table does not exist (ansible#14648) Set subscription type as developer for developer subscriptions. (ansible#14584) * Set subscription type as developer for developer subscriptions. Signed-off-by: Tong He <[email protected]> * Set subscription type as developer for developer subscription manifests. Signed-off-by: Tong He <[email protected]> * Remedy the wrong character to assign value. Signed-off-by: Tong He <[email protected]> * Reformat licensing.py by black. Signed-off-by: Tong He <[email protected]> --------- Signed-off-by: Tong He <[email protected]> issue ansible#14653 heading does not render correctly (ansible#14665) Adding the possibility to decode base64 decoded strings to Delinea's Devops Secret Vault (DSV) (ansible#14646) Adding the possibility to decode base64 decoded strings to Delinea's Devops Secret Vault (DSV). This is necessary as uploading files to DSV is not possible (and not meant to be) and files should be added base64 encoded. The commit is making sure to remain backward compatible (no secret decoding), as a default is supplied. This has been tested with DSV and works for secrets that are base64 encoded and secrets that are not base64 encoded (which is the default). Signed-off-by: Steffen Scheib <[email protected]> Added missing pointers to release notes (ansible#14659) * Replaced with larger graphic. * Revert "Replaced with larger graphic." This reverts commit 1214b00. * Added missing pointers to release notes. Make vault init more idempotent (ansible#14664) Currently if you cleanup docker volume for vault and bring docker-compose development back up with vault enabled we will not initialize vault because the secret files still exist. This change will attempt to initialize vault reguardless and update the secret file if vault is initialized Remove unused methods we attach to user model (ansible#14668) Update RBAC docs, remove unused get_permissions (ansible#14492) * Update RBAC docs, remove unused get_permissions * Add back in section for get_roles_on_resource Upgrade doc requirements (ansible#14669) * upgrade when pip compiling doc reqs * upgrade doc requirements allow pytest --migrations to succeed (ansible#14663) * allow pytest --migrations to succeed * We actually subvert migrations from running in test via pytest.ini --no-migrations option. This has led to bit rot for the sqlite migrations happy path. This changeset pays off that tech debt and allows for an sqlite migration happy path. * This paves the way for programatic invocation of individual migrations and weaving of the creation of resources (i.e. Instance, Job Template, etc). With this, a developer can instantiate various database states, trigger a migration, assert the state of the db, and then have pytest rollback all of that. * I will note that in practice, running these migrations is dog shit slow BUT this work also opens up the possibility of saving and re-using sqlite3 database files. Normally, caching is not THE answer and causes more harm than good. But in this case, our migrations are mostly write-once (I say mostly because this change set violates that :) so cache invalidation isn't a major issue. * functional test for migrations on sqlite * We commonly subvert running migrations in test land. Test land uses sqlite. By not constantly exercising this code path it atrophies. The smoke test here is to continuously exercise that code path. * Add ci test to run migration tests separately, they take =~ 2-3 minutes each on my laptop. * The smoke tests also serves as an example of how to write migration tests. * run migration tests in ci Fix awx collection publishing on galaxy (ansible#14642) --location (-L) parameter will prompt curl to submit a new request if the URL is a redirect. After moving to galaxy-NG without -L the curl falsely return 302 for any version Co-authored-by: John Barker <[email protected]> Fixing wsrelay connection loop (ansible#14692) * Fixing wsrelay connection loop * The loop was being interrupted when reaching the return statements, causing a race condition that would make nodes remain disconnected from their websockets * Added log messages for the previous return state to improve the logging from this state. * Added logging for malformed payload * Update awx/main/wsrelay.py Co-authored-by: Rick Elrod <[email protected]> * Moved logmsg outside condition --------- Co-authored-by: Lucas Benedito <[email protected]> Co-authored-by: Rick Elrod <[email protected]> Fix the bulk Job Launch Integration test in awx collection (ansible#14702) * fix the integration tests [CI] Reduce GHA timeouts from 6h default (ansible#14704) * [CI] Reduce GHA timeouts from 6h default The goal here is to never interfere with a real run (so most of the timeout-minutes values seem rather high) but to avoid having 6h long runs if something goes crazy and never ends. Signed-off-by: Rick Elrod <[email protected]> * Do bash hackery instead Signed-off-by: Rick Elrod <[email protected]> --------- Signed-off-by: Rick Elrod <[email protected]> separate tox calls in readthedocs config (ansible#14673) Add TLS certificate auth for HashiCorp Vault (ansible#14534) * Add TLS certificate auth for HashiCorp Vault Add support for AWX to authenticate with HashiCorp Vault using TLS client certificates. Also updates the documentation for the HashiCorp Vault secret management plugins to include both the new TLS options and the missing Kubernetes auth method options. Signed-off-by: Andrew Austin <[email protected]> * Refactor docker-compose vault for TLS cert auth Add TLS configuration to the docker-compose Vault configuration and use that method by default in vault plumbing. This ensures that the result of bringing up the docker-compose stack with vault enabled and running the plumb-vault playbook is a fully working credential retrieval setup using TLS client cert authentication. Signed-off-by: Andrew Austin <[email protected]> * Remove incorrect trailing space Co-authored-by: Hao Liu <[email protected]> * Make vault init idempotent - improve error handling for vault_initialization - ignore error if vault cert auth is already configured - removed unused register * Add VAULT_TLS option Make TLS for HashiCorp Vault optional and configurable via VAULT_TLS env var * Add retries for vault init Sometime it took longer for vault to fully come up and init will fail --------- Signed-off-by: Andrew Austin <[email protected]> Co-authored-by: Hao Liu <[email protected]> Co-authored-by: Hao Liu <[email protected]> remove unnecessary required flags for saml backend (ansible#14666) Signed-off-by: Tyler Muir <[email protected]> Dependabot for docsite requirements (ansible#14670) Add django-ansible-base (ansible#14705) * add django-ansible-base Signed-off-by: jessicamack <[email protected]> * add licenses * add django-ansible-base Signed-off-by: jessicamack <[email protected]> * add licenses * apply patch to fix permissions issue --------- Signed-off-by: jessicamack <[email protected]> Remove incorrectly formatted line from requirements.txt (ansible#14714) remove git+ line Fix updater bug due to missing newline at EOF (ansible#14713) Fix undefined error in settings/logging/edit form (ansible#14715) Fix undefined error in logging settings edit form Update setuptools-scm (ansible#14716) * properly format requirement * upgrade setuptools_scm * Revert "properly format requirement" This reverts commit 4c87929. * test ansible-runner package upgrade * Revert "test ansible-runner package upgrade" This reverts commit ba4b74f. Adding hosts bulk deletion feature (ansible#14462) * Adding hosts bulk deletion feature Signed-off-by: Avi Layani <[email protected]> * fix the type of the argument Signed-off-by: Avi Layani <[email protected]> * fixing activity_entry tracking Signed-off-by: Avi Layani <[email protected]> * Revert "fixing activity_entry tracking" This reverts commit c8eab52. Since the bulk_delete is not related to an inventory, only hosts which can be from different inventories. * get only needed vars to reduce memory consumption Signed-off-by: Avi Layani <[email protected]> * filtering the data to reduce memory increase the number of queries Signed-off-by: Avi Layani <[email protected]> * update the activity stream for inventories Signed-off-by: Avi Layani <[email protected]> * fix the changes dict initialiazation Signed-off-by: Avi Layani <[email protected]> --------- Signed-off-by: Avi Layani <[email protected]> Remove superwatcher from docker-compose dev (ansible#14708) When making changes to the application sometime you can accidentally cause FATAL state and cause the dev container to crash which will remove any ephemeral changes that you have made and is ANNOYING! Recover rsyslog from 4xx error Due to ansible#7560 'omhttp' module for rsyslog will completely stop forwarding message to external log aggregator after receiving a 4xx error from the external log aggregator This PR is an "workaround" for this problem by restarting rsyslogd after detecting that rsyslog received a 4xx error Correct misuse of stdxxx_event_enabled Not every log messages need to be emitted as a event! Send SIGKILL to rsyslog if hard cancellation is needed Simplify RBAC get_roles_on_resource method (ansible#14710) * Simplify RBAC get_roles_on_resource method * Fix bug * Fix query type bug Narrow the actor types accepted for RBAC evaluations (ansible#14709) * Narrow the scope of RBAC evaluations * Update tests for RBAC method changes * Simplify querset for credentials in org * Fix call pattern to pass in team role obj Use filtering/sorting from django-ansible-base (ansible#14726) * Move filtering to DAB * add comment to trigger building a new image Signed-off-by: jessicamack <[email protected]> * remove unneeded comment Signed-off-by: jessicamack <[email protected]> * remove unused imports Signed-off-by: jessicamack <[email protected]> * change mock import Signed-off-by: jessicamack <[email protected]> --------- Signed-off-by: jessicamack <[email protected]> Co-authored-by: jessicamack <[email protected]> add awx collection export tests * Basic export tests * Added test that highlights a problem with running Schedule exports as non-root user. We rely on the POST key in the OPTIONS response to determine the fields to export for a resource. The POST key is not present if a user does NOT have create privileges. * Fixed up forwarding all headers from the API server back to the test code. This was causing a problem in awxkit code that checks for allowed HTTP Verbs in the headers. refactor awxkit import code * Move awxkit import code into a pytest fixture to better control when the import happens * Ensure /awx_devel/awxkit is added to sys path before awxkit import runs Fix twilio_backend.py to send SMS to multiple destinations. (ansible#14656) AWX only sends Twilio notifications to one destination with the current version of code, but this is a bug. Fixed this bug for sending SMS to multiple destinations. Persist schedule prompt on launch fields when editing (ansible#14736) * persist schedule prompt on launch fields when editing * Merge job template default credentials with schedule overrides in schedule prompt * rename vars for clarity * handle undefined defaultCredentials --------- Co-authored-by: Michael Abashian <[email protected]>
AlanCoding
pushed a commit
to AlanCoding/awx
that referenced
this pull request
Jan 22, 2024
…ble#14584) (ansible#6535) * Set subscription type as developer for developer subscriptions. * Set subscription type as developer for developer subscription manifests. * Remedy the wrong character to assign value. * Reformat licensing.py by black. --------- Signed-off-by: Tong He <[email protected]> Co-authored-by: Tong He <[email protected]>
djyasin
pushed a commit
to djyasin/awx
that referenced
this pull request
Sep 16, 2024
…ble#14584) * Set subscription type as developer for developer subscriptions. Signed-off-by: Tong He <[email protected]> * Set subscription type as developer for developer subscription manifests. Signed-off-by: Tong He <[email protected]> * Remedy the wrong character to assign value. Signed-off-by: Tong He <[email protected]> * Reformat licensing.py by black. Signed-off-by: Tong He <[email protected]> --------- Signed-off-by: Tong He <[email protected]>
djyasin
pushed a commit
to djyasin/awx
that referenced
this pull request
Nov 11, 2024
…ble#14584) * Set subscription type as developer for developer subscriptions. Signed-off-by: Tong He <[email protected]> * Set subscription type as developer for developer subscription manifests. Signed-off-by: Tong He <[email protected]> * Remedy the wrong character to assign value. Signed-off-by: Tong He <[email protected]> * Reformat licensing.py by black. Signed-off-by: Tong He <[email protected]> --------- Signed-off-by: Tong He <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
The subscription type in AAP controller is enterprise by default except trial SKUs. It seems not that appropriate to show enterprise for developer subscriptions.
This PR aims to set subscription type as developer for developer subscriptions.
ISSUE TYPE
COMPONENT NAME
AWX VERSION
ADDITIONAL INFORMATION
Active subscriptions that match this criteria: RH00798, RH2262474, RH2262474F3.
As per current aggregation rules, these subscriptions could not be aggregated with any other applicable subscriptions, so no need to consider which subscription type to set when someone upload a manifest with both the aforementioned developer subscriptions and other Ansible subscriptions.