diff --git a/README.md b/README.md index 3e1b5f61..6c29a516 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Puppet::ResourceApi [![TravisCI Build Status](https://travis-ci.org/puppetlabs/puppet-resource_api.svg?branch=master)](https://travis-ci.org/puppetlabs/puppet-resource_api) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/8o9s1ax0hs8lm5fd/branch/master?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet-resource-api/branch/master) [![codecov](https://codecov.io/gh/puppetlabs/puppet-resource_api/branch/master/graph/badge.svg)](https://codecov.io/gh/puppetlabs/puppet-resource_api) +# Puppet::ResourceApi [![TravisCI Build Status](https://travis-ci.org/puppetlabs/puppet-resource_api.svg?branch=main)](https://travis-ci.org/puppetlabs/puppet-resource_api) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/8o9s1ax0hs8lm5fd/branch/main?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet-resource-api/branch/main) [![codecov](https://codecov.io/gh/puppetlabs/puppet-resource_api/branch/main/graph/badge.svg)](https://codecov.io/gh/puppetlabs/puppet-resource_api) -This is an implementation of the [Resource API specification](https://github.com/puppetlabs/puppet-specifications/blob/master/language/resource-api/README.md). +This is an implementation of the [Resource API specification](https://github.com/puppetlabs/puppet-specifications/blob/main/language/resource-api/README.md). Find a working example of a new-style providers in the [Palo Alto Firewall module](https://github.com/puppetlabs/puppetlabs-panos/): -* [Type](https://github.com/puppetlabs/puppetlabs-panos/blob/master/lib/puppet/type/panos_address.rb) -* [Base provider](https://github.com/puppetlabs/puppetlabs-panos/blob/master/lib/puppet/provider/panos_provider.rb) -* [Actual provider with validation and xml processing](https://github.com/puppetlabs/puppetlabs-panos/blob/master/lib/puppet/provider/panos_address/panos_address.rb) -* [New unit tests](https://github.com/puppetlabs/puppetlabs-panos/blob/master/spec/unit/puppet/provider/panos_provider_spec.rb) for 100% coverage. +* [Type](https://github.com/puppetlabs/puppetlabs-panos/blob/main/lib/puppet/type/panos_address.rb) +* [Base provider](https://github.com/puppetlabs/puppetlabs-panos/blob/main/lib/puppet/provider/panos_provider.rb) +* [Actual provider with validation and xml processing](https://github.com/puppetlabs/puppetlabs-panos/blob/main/lib/puppet/provider/panos_address/panos_address.rb) +* [New unit tests](https://github.com/puppetlabs/puppetlabs-panos/blob/main/spec/unit/puppet/provider/panos_provider_spec.rb) for 100% coverage. ## [Find the full Resource API documentation here](https://puppet.com/docs/puppet/latest/custom_resources.html) diff --git a/docs/hands-on-lab/04-adding-a-new-transport.md b/docs/hands-on-lab/04-adding-a-new-transport.md index 759d41be..165f8ff5 100644 --- a/docs/hands-on-lab/04-adding-a-new-transport.md +++ b/docs/hands-on-lab/04-adding-a-new-transport.md @@ -87,7 +87,7 @@ david@davids:~/tmp/hue$ git init Initialized empty Git repository in ~/tmp/hue/.git/ david@davids:~/tmp/hue$ git add -A david@davids:~/tmp/hue$ git commit -m 'initial commit' -[master (root-commit) 67951dd] initial commit +[main (root-commit) 67951dd] initial commit 26 files changed, 887 insertions(+) create mode 100644 .fixtures.yml create mode 100644 .gitattributes diff --git a/docs/hands-on-lab/07-implementing-a-task.md b/docs/hands-on-lab/07-implementing-a-task.md index bf691f32..3ca4540d 100644 --- a/docs/hands-on-lab/07-implementing-a-task.md +++ b/docs/hands-on-lab/07-implementing-a-task.md @@ -84,7 +84,7 @@ I, [2019-06-04T13:43:58.577944 #9390] INFO -- : Creating symlink from spec/fixt david@davids:~/tmp/hue_workshop$ ``` -* `pdk new task` based on https://github.com/puppetlabs/puppetlabs-panos/blob/master/tasks/apikey.rb +* `pdk new task` based on https://github.com/puppetlabs/puppetlabs-panos/blob/main/tasks/apikey.rb ``` david@davids:~/tmp/hue_workshop$ pdk new task alarm diff --git a/spec/fixtures/test_module/.travis.yml b/spec/fixtures/test_module/.travis.yml index 81f77dde..667e4bd0 100644 --- a/spec/fixtures/test_module/.travis.yml +++ b/spec/fixtures/test_module/.travis.yml @@ -29,7 +29,7 @@ matrix: rvm: 2.1.9 branches: only: - - master + - main - /^v\d/ notifications: email: false diff --git a/spec/fixtures/test_module/metadata.json b/spec/fixtures/test_module/metadata.json index 78f8047c..a2b80ff7 100644 --- a/spec/fixtures/test_module/metadata.json +++ b/spec/fixtures/test_module/metadata.json @@ -24,5 +24,5 @@ ], "pdk-version": "1.7.0.pre (9)", "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git", - "template-ref": "heads/master-0-gc87eee3" + "template-ref": "heads/main-0-gc87eee3" }