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.

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

Document using .erlang.crypt with ExDoc #1949

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
runs-on: ubuntu-20.04
env:
MIX_ENV: test
CI: true
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Improve warning when referencing type from a private module
* Rename "Search HexDocs package" modal to "Go to package docs". Support built-in Erlang/OTP
apps.
* Document how to use `.erlang.crypt` with ExDoc

* Bug fixes
* Switch anchor `title` to `aria-label`
Expand Down
8 changes: 8 additions & 0 deletions lib/mix/tasks/docs.ex
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,14 @@ defmodule Mix.Tasks.Docs do
where path is either an relative path from the cwd, or an absolute path. The function
must return the full URI as it should be placed in the documentation.

## Encrypted debug info

If a module is compiled with [encrypted debug info](`:compile.file/2`), ExDoc will not be able to
extract its documentation without preparation. ExDoc supports using `.erlang.crypt` to decrypt
debug information. Consult the
[`.erlang.crypt` section in the `:beam_lib` documentation](`m::beam_lib#module-erlang-crypt`)
for more information.

## Groups

ExDoc content can be organized in groups. This is done via the `:groups_for_extras`
Expand Down
55 changes: 55 additions & 0 deletions test/ex_doc/retriever/erlang_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,61 @@ defmodule ExDoc.Retriever.ErlangTest do
|> Erlang.autolink_spec(current_module: :mod, current_kfa: {:type, :type, 0}) ==
"type() :: #a{a :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:pos_integer/0\">pos_integer</a>(), b :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:non_neg_integer/0\">non_neg_integer</a>(), c :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:atom/0\">atom</a>(), d :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:term/0\">term</a>(), e :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:term/0\">term</a>()}."
end

@tag :ci
Copy link
Member

Choose a reason for hiding this comment

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

We don’t want to tag it as CI. We probably want it to be called encrypted_info or similar and check if the encrypted info is enabled or not in the test helper. CI just makes sure to put the file in place. WDYT?

test "modules with encrypted debug info", c do
File.cp!("test/fixtures/.erlang.crypt", ".erlang.crypt")

erlc(
c,
:debug_info_mod,
~S"""
-module(debug_info_mod).
-moduledoc("mod docs.").
-export([function1/0]).
-export_type([foo/0]).

-doc("foo/0 docs.").
-type foo() :: atom().

-doc("function1/0 docs.").
-spec function1() -> atom().
function1() -> ok.
""",
debug_info_key: ~c"SECRET"
)

{[mod], []} = Retriever.docs_from_modules([:debug_info_mod], %ExDoc.Config{})

assert %ExDoc.ModuleNode{
moduledoc_file: moduledoc_file,
docs: [function1],
id: "debug_info_mod",
module: :debug_info_mod,
title: "debug_info_mod",
typespecs: [foo]
} = mod

assert DocAST.to_string(mod.doc) =~ "mod docs."
assert DocAST.to_string(function1.doc) =~ "function1/0 docs."
assert DocAST.to_string(foo.doc) =~ "foo/0 docs."
assert moduledoc_file =~ "debug_info_mod.erl"

erlc(
c,
:debug_info_mod2,
~S"""
-module(debug_info_mod2).
-moduledoc("mod docs.").
""",
debug_info_key: {:des3_cbc, ~c"PASSWORD"}
)

assert {[%ExDoc.ModuleNode{module: :debug_info_mod2}], []} =
Retriever.docs_from_modules([:debug_info_mod2], %ExDoc.Config{})

File.rm!(".erlang.crypt")
end
end

describe "docs_from_modules/2 edoc" do
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/.erlang.crypt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[{debug_info, des3_cbc, debug_info_mod, "SECRET"},
{debug_info, des3_cbc, [], "PASSWORD"}].
20 changes: 14 additions & 6 deletions test/test_helper.exs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
otp_eep48? = Code.ensure_loaded?(:edoc_doclet_chunks)
otp_eep59? = Code.ensure_loaded?(:beam_doc)
ci? = System.get_env("CI") == "true"

exclude = [
otp_eep48: not otp_eep48?,
otp_eep59: not otp_eep59?,
otp_has_docs: not match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:array))
otp_has_docs: not match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:array)),
ci: not ci?
]

ExUnit.start(exclude: Enum.filter(exclude, &elem(&1, 1)))
Expand Down Expand Up @@ -58,14 +60,20 @@ defmodule TestHelper do

beam_docs = docstrings(docs, context)

# not to be confused with the regular :debug_info opt
debug_info_opts =
Enum.filter(opts, fn
{:debug_info, _debug_info} -> true
{:debug_info_key, _debug_info_key} -> true
:encrypt_debug_info -> true
_ -> false
end)

{:ok, module} =
:compile.file(
String.to_charlist(src_path),
[
:return_errors,
:debug_info,
outdir: String.to_charlist(ebin_dir)
] ++ beam_docs
[:return_errors, :debug_info, outdir: String.to_charlist(ebin_dir)] ++
beam_docs ++ debug_info_opts
)

true = Code.prepend_path(ebin_dir)
Expand Down
Loading