Skip to content

Commit

Permalink
Defaults upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
krystian-panek-vmltech committed Jan 26, 2024
1 parent 96d905a commit c5dcc23
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 5 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ For example:
- `sh develop.sh examples/aws_ssh apply -auto-approve`
- `sh develop.sh examples/aws_ssh destroy -auto-approve`

- `sh develop.sh examples/aws_ssm plan`
- `sh develop.sh examples/aws_ssm apply -auto-approve`
- `sh develop.sh examples/aws_ssm destroy -auto-approve`

## Debugging the Provider

1. Run command `go run . -debug` from IDEA in debug mode and copy the value of `TF_REATTACH_PROVIDERS` from the output.
Expand Down
38 changes: 36 additions & 2 deletions examples/aws_ssh/aem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ instance:
# Time to wait for next state checking
interval: 6s
# Number of successful check attempts that indicates end of checking
done_threshold: 3
done_threshold: 4
# Wait only for those instances whose state has been changed internally (unaware of external changes)
await_strict: true
# Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package
Expand All @@ -74,12 +74,15 @@ instance:
timeout: 10m
# Max time in which socket connection to instance should be established
reachable:
skip: false
timeout: 3s
# Bundle state tracking
bundle_stable:
skip: false
symbolic_names_ignored: []
# OSGi events tracking
event_stable:
skip: false
# Topics indicating that instance is not stable
topics_unstable:
- "org/osgi/framework/ServiceEvent/*"
Expand All @@ -91,16 +94,32 @@ instance:
- "org.osgi.service.component.runtime.ServiceComponentRuntime"
- "java.util.ResourceBundle"
received_max_age: 5s
# OSGi components state tracking
component_stable:
skip: false
pids:
include: ['com.day.crx.packaging.*', 'org.apache.sling.installer.*']
exclude: ['org.apache.sling.installer.hc.*', 'org.apache.sling.installer.core.impl.console.*']
match:
"disabled": []
"no config": []
"unsatisfied (reference)": []
"satisfied": []
# Sling Installer tracking
installer:
skip: false
# JMX state checking
state: true
# Pause Installation nodes checking
pause: true
# Specific endpoints / paths (like login page)
path_ready:
timeout: 10s

login_page:
skip: false
path: "/libs/granite/core/content/login.html"
status_code: 200
contained_text: QUICKSTART_HOMEPAGE

# Managed locally (set up automatically)
local:
Expand Down Expand Up @@ -138,6 +157,7 @@ instance:
package:
# Force re-uploading/installing of snapshot AEM packages (just built / unreleased)
snapshot_patterns: [ "**/*-SNAPSHOT.zip" ]
snapshot_ignored: false
# Use checksums to avoid re-deployments when snapshot AEM packages are unchanged
snapshot_deploy_skipping: true
# Disable following workflow launchers for a package deployment time only
Expand All @@ -151,6 +171,16 @@ instance:
console: false
# Fail on case 'installed with errors'
strict: true
# Number of changes after which the commit to the repository is performed
install_save_threshold: 1024
# Allows to relax dependency handling if needed
install_dependency_handling: required
# Controls how 'rep:policy' nodes are handled during import
install_ac_handling: ''

# 'SSL By Default'
ssl:
setup_timeout: 30s

# OSGi Framework
osgi:
Expand All @@ -166,6 +196,10 @@ instance:
crypto:
key_bundle_symbolic_name: com.adobe.granite.crypto.file

# Replication
replication:
bundle_symbolic_name: com.day.cq.cq-replication

# Workflow Manager
workflow:
launcher:
Expand Down
38 changes: 36 additions & 2 deletions internal/provider/instance/aem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ instance:
# Time to wait for next state checking
interval: 6s
# Number of successful check attempts that indicates end of checking
done_threshold: 3
done_threshold: 4
# Wait only for those instances whose state has been changed internally (unaware of external changes)
await_strict: true
# Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package
Expand All @@ -74,12 +74,15 @@ instance:
timeout: 10m
# Max time in which socket connection to instance should be established
reachable:
skip: false
timeout: 3s
# Bundle state tracking
bundle_stable:
skip: false
symbolic_names_ignored: []
# OSGi events tracking
event_stable:
skip: false
# Topics indicating that instance is not stable
topics_unstable:
- "org/osgi/framework/ServiceEvent/*"
Expand All @@ -91,16 +94,32 @@ instance:
- "org.osgi.service.component.runtime.ServiceComponentRuntime"
- "java.util.ResourceBundle"
received_max_age: 5s
# OSGi components state tracking
component_stable:
skip: false
pids:
include: ['com.day.crx.packaging.*', 'org.apache.sling.installer.*']
exclude: ['org.apache.sling.installer.hc.*', 'org.apache.sling.installer.core.impl.console.*']
match:
"disabled": []
"no config": []
"unsatisfied (reference)": []
"satisfied": []
# Sling Installer tracking
installer:
skip: false
# JMX state checking
state: true
# Pause Installation nodes checking
pause: true
# Specific endpoints / paths (like login page)
path_ready:
timeout: 10s

login_page:
skip: false
path: "/libs/granite/core/content/login.html"
status_code: 200
contained_text: QUICKSTART_HOMEPAGE

# Managed locally (set up automatically)
local:
Expand Down Expand Up @@ -138,6 +157,7 @@ instance:
package:
# Force re-uploading/installing of snapshot AEM packages (just built / unreleased)
snapshot_patterns: [ "**/*-SNAPSHOT.zip" ]
snapshot_ignored: false
# Use checksums to avoid re-deployments when snapshot AEM packages are unchanged
snapshot_deploy_skipping: true
# Disable following workflow launchers for a package deployment time only
Expand All @@ -151,6 +171,16 @@ instance:
console: false
# Fail on case 'installed with errors'
strict: true
# Number of changes after which the commit to the repository is performed
install_save_threshold: 1024
# Allows to relax dependency handling if needed
install_dependency_handling: required
# Controls how 'rep:policy' nodes are handled during import
install_ac_handling: ''

# 'SSL By Default'
ssl:
setup_timeout: 30s

# OSGi Framework
osgi:
Expand All @@ -166,6 +196,10 @@ instance:
crypto:
key_bundle_symbolic_name: com.adobe.granite.crypto.file

# Replication
replication:
bundle_symbolic_name: com.day.cq.cq-replication

# Workflow Manager
workflow:
launcher:
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/instance_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (r *InstanceResource) Schema(ctx context.Context, req resource.SchemaReques
MarkdownDescription: "Version of AEM Compose tool to use on remote machine.",
Computed: true,
Optional: true,
Default: stringdefault.StaticString("1.5.9"),
Default: stringdefault.StaticString("1.6.12"),
},
"config": schema.StringAttribute{
MarkdownDescription: "Contents o f the AEM Compose YML configuration file.",
Expand Down

0 comments on commit c5dcc23

Please sign in to comment.