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.

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

Accept Puppet-Datatype Sensitive #1119

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accept Puppet-Datatype Sensitive #1119

wants to merge 1 commit into from
+108 −74

Conversation

cocker-cc
Copy link
Contributor

@cocker-cc cocker-cc commented Jun 17, 2021 •
edited

  • let the Hash containing the Secrets for the Keystore accept Secrets of Datatype Sensitive
  • fix a 15-Months-old Typo-Bug

Pull request acceptance prerequisites:

  • Signed the CLA (if not already signed)
  • Rebased/up-to-date with base branch
  • Tests pass
  • Updated CHANGELOG.md with patch notes (if necessary)
  • Updated CONTRIBUTORS (if attribution is requested)

@elasticmachine
Copy link

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@cla-checker-service
Copy link

cla-checker-service bot commented Jun 17, 2021 •
edited

💚 CLA has been signed

@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from 0bd130a to e81fcf1 Compare June 23, 2021 11:12
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from e2858f5 to f3b6124 Compare September 6, 2021 03:13
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch 2 times, most recently from a387f82 to e135734 Compare February 9, 2022 02:35
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch 2 times, most recently from 46e5306 to 25fec6d Compare April 14, 2022 21:15
@bastelfreak bastelfreak added the enhancement New feature or request label Apr 14, 2022
@bastelfreak
Copy link
Member

thanks for the PR! can you add some tests with sensitive data?

@cocker-cc
Copy link
Contributor Author

cocker-cc commented Apr 14, 2022 •
edited

thanks for the PR! can you add some tests with sensitive data?

I would like to. But with this outdated Hiera 3 in use, I won't.
With Hiera 5 one could do something like…

---
lookup_options:
  elasticsearch::api_basic_auth_password:
    convert_to: Sensitive

elasticsearch::api_basic_auth_password: MY_API_BASIC_AUTH_PASSWORD

… to retrieve sensitive Strings from Hiera.

So, if you mind to migrate to Hiera 5? I could do the Migration, but currently I am quite busy.
I migrated the Fixtures-Hiera to Hiera 5 in this PR.

@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from 25fec6d to 0fe3ae7 Compare July 23, 2022 09:13
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from 0fe3ae7 to 9180744 Compare August 30, 2022 11:29
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from 9180744 to 71d7c01 Compare October 17, 2022 11:55
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from 71d7c01 to f074118 Compare April 21, 2023 12:33
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch 2 times, most recently from c4628ea to e3c7304 Compare June 19, 2023 12:13
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch 2 times, most recently from 8703fc3 to d379556 Compare March 26, 2024 08:28
bastelfreak
bastelfreak reviewed Mar 26, 2024
View reviewed changes
REFERENCE.md Outdated
@@ -57,8 +57,8 @@

### Data types

* [`Elasticsearch::Multipath`](#Elasticsearch--Multipath)
* [`Elasticsearch::Status`](#Elasticsearch--Status)
* [`Elasticsearch::Multipath`](#Elasticsearch--Multipath): @ summary Puppet-Type for Elasticsearch's Multipath
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't rendered correctly

bastelfreak
bastelfreak reviewed Mar 26, 2024
View reviewed changes
types/multipath.pp Outdated
@@ -1 +1,3 @@
# @ summary Puppet-Type for Elasticsearch's Multipath
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# @ summary Puppet-Type for Elasticsearch's Multipath
# @summary Puppet-Type for Elasticsearch's Multipath

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this is not Part of my Pullrequest, please fix it in master, and I will rebase.
I just wanted to make the Pipeline happy.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you added this change, but the change isn't correct :D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted the non-relevant Changes. But the following also happens in master:

[warn]: Missing documentation for Puppet type alias 'Elasticsearch::Status' at types/status.pp:1.                                                                                                                    
[warn]: Missing documentation for Puppet type alias 'Elasticsearch::Multipath' at types/multipath.pp:1.

[…]

  1) Puppet::Type::Elasticsearch_keystore::ProviderElasticsearch_keystore instances with one instance                                                                                                                
     Failure/Error: stdout = execute([command(:keystore)] + args, options)                                                                                                                                           
                                                                                                                                                                                                                     
       #<Puppet::Type::Elasticsearch_keystore::ProviderElasticsearch_keystore (class)> received :execute with unexpected arguments                                                                                   
         expected: (["/usr/share/elasticsearch/bin/elasticsearch-keystore", "list"], {:custom_environment=>{"ES_INCLUDE"=>"/etc/default/elasticsearch-es-01", "ES_PATH_CONF"=>"/etc/elasticsearch/es-01"}, :failonfai
l=>true, :gid=>"elasticsearch", :uid=>"elasticsearch"})                                                                                                                                                              
              got: (["/usr/share/elasticsearch/bin/elasticsearch-keystore", "list"], {:custom_environment=>{"ES_INCLUDE"=>"/etc/sysconfig/elasticsearch-es-01", "ES_PATH_CONF"=>"/etc/elasticsearch/es-01"}, :failonf
ail=>true, :gid=>"elasticsearch", :uid=>"elasticsearch"})                                                                                                                                                            
       Diff:                                                                                                                                                                                                         
       @@ -1,6 +1,6 @@                                                                                                                                                                                               
        [["/usr/share/elasticsearch/bin/elasticsearch-keystore", "list"],                                                                                                                                            
         {:custom_environment=>                                                                                                                                                                                      
       -   {"ES_INCLUDE"=>"/etc/default/elasticsearch-es-01",                                                                                                                                                        
       +   {"ES_INCLUDE"=>"/etc/sysconfig/elasticsearch-es-01",                                                                                                                                                      
            "ES_PATH_CONF"=>"/etc/elasticsearch/es-01"},                                                                                                                                                             
          :failonfail=>true,                                                                                                                                                                                         
          :gid=>"elasticsearch",

@cocker-cc
Accept Puppet-Datatype Sensitive
08ba0d1 
- let the Hash containing the Secrets for the Keystore accept Secrets of Datatype Sensitive
- fix a 15-Months-old Typo-Bug
- let api_basic_auth_password also be of Type Sensitive
@cocker-cc cocker-cc force-pushed the Accept_Puppet-Datatype_Sensitive branch from d379556 to 08ba0d1 Compare March 26, 2024 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bastelfreak bastelfreak bastelfreak approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@cocker-cc @elasticmachine @bastelfreak @ghoneycutt